Skip to contentSkip to conversation

lm-sensors: remove redundant BUILD_STATIC_LIB build parameter

PATCH New Baruch Siach 4 participants 8 messages Dec 27, 2018 – Jan 18, 2019

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/3 lm-sensors: remove redundant BUILD_STATIC_LIB build parameter

Commit 3e05efd76636 ("package/lm-sensors: disable static library for shared-only build") added BUILD_STATIC_LIB to LM_SENSORS_MAKE_OPTS with value that depends on BR2_SHARED_LIBS, but forgot to remove it from the common LM_SENSORS_MAKE_OPTS. Fix that.

Cc Romain Naour <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/lm-sensors/lm-sensors.mk | 1 -
 1 file changed, 1 deletion(-)
package/lm-sensors/lm-sensors.mk +0 -1
index 6fc7ce4981c9..778a355b0f7a 100644
@@ -21,7 +21,6 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
 LM_SENSORS_MAKE_OPTS = \
-	BUILD_STATIC_LIB=1 \
 	MACHINE=$(KERNEL_ARCH) \
 	PREFIX=/usr
Signature · 1 line
2.19.2
author
#1 lore raw

PATCH 2/3 lm-sensors: make ISA tools depend on x86

The isadump and isaset tools are built for x86 targets only.

Signed-off-by Baruch Siach <[email protected]>
---
 package/lm-sensors/Config.in | 2 ++
 1 file changed, 2 insertions(+)
package/lm-sensors/Config.in +2 -0
index 60571b784f2a..a2e027599908 100644
@@ -25,12 +25,14 @@ config BR2_PACKAGE_LM_SENSORS_FANCONTROL
 
 config BR2_PACKAGE_LM_SENSORS_ISADUMP
 	bool "isadump"
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  Isadump is a small helper program to examine registers
 	  visible through the ISA bus.
 
 config BR2_PACKAGE_LM_SENSORS_ISASET
 	bool "isaset"
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  Isaset is a small helper program to set register visible
 	  through the ISA bus.
Signature · 1 line
2.19.2
#2 lore raw

PATCH 2/3 lm-sensors: make ISA tools depend on x86

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

The isadump and isaset tools are built for x86 targets only.

Signed-off-by Baruch Siach <[email protected]>

Committed to 2018.02.x and 2018.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 3/3 lm-sensors: bump to version 3.5.0

In reply to Baruch Siach

Download site is now at github.

Drop upstream musl fix patch.

Add license files hashes.

Signed-off-by Baruch Siach <[email protected]>
---
 .../lm-sensors/0003-musl-fix-includes.patch   | 100 ------------------
 package/lm-sensors/lm-sensors.hash            |   4 +-
 package/lm-sensors/lm-sensors.mk              |   5 +-
 3 files changed, 5 insertions(+), 104 deletions(-)
 delete mode 100644 package/lm-sensors/0003-musl-fix-includes.patch
package/lm-sensors/0003-musl-fix-includes.patch deleted +0 -100
deleted file mode 100644
index 69325abce046..000000000000
@@ -1,100 +0,0 @@
-From 6d85773537c9f277ed342f57500f784ccb2c4a3e Mon Sep 17 00:00:00 2001
-From: Brendan Heading <[email protected]>
-Date: Sun, 30 Aug 2015 22:26:39 +0100
-Subject: [PATCH 1/1] fix compilation under musl
-
-This patch removes conditional compilation elements that are designed to
-support glibc versions earlier than 2.0, which were causing the build
-to fail under musl.
-
-Based on the patch found here :
-
-http://git.alpinelinux.org/cgit/aports/plain/main/lm_sensors/musl-fix-includes.patch?id=fece1d19448dbd3a56fd8ac70443116187141848
-
-This patch has been accepted for integration upstream and should be
-present in the next release. See :
-
-http://www.lm-sensors.org/changeset/6314
-
-Signed-off-by: Brendan Heading <[email protected]>
-Upstream-Status: pending
----
- prog/dump/isadump.c | 6 ------
- prog/dump/isaset.c  | 6 ------
- prog/dump/superio.c | 5 -----
- prog/dump/util.c    | 5 -----
- 4 files changed, 22 deletions(-)
-
-diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c
-index e031e47..88e4c3b 100644
---- a/prog/dump/isadump.c
-+++ b/prog/dump/isadump.c
-@@ -36,13 +36,7 @@
- #include "util.h"
- #include "superio.h"
- 
--
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
-diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c
-index 1d1bdad..a084c8a 100644
---- a/prog/dump/isaset.c
-+++ b/prog/dump/isaset.c
-@@ -32,13 +32,7 @@
- #include <string.h>
- #include "util.h"
- 
--
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
-diff --git a/prog/dump/superio.c b/prog/dump/superio.c
-index 1af7358..31e0d78 100644
---- a/prog/dump/superio.c
-+++ b/prog/dump/superio.c
-@@ -20,12 +20,7 @@
- */
- 
- #include <stdlib.h>
--
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #include "superio.h"
- 
-diff --git a/prog/dump/util.c b/prog/dump/util.c
-index 676c339..d8b0927 100644
---- a/prog/dump/util.c
-+++ b/prog/dump/util.c
-@@ -11,12 +11,7 @@
- #include <stdio.h>
- #include "util.h"
- 
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- /* Return 1 if we should continue, 0 if we should abort */
- int user_ack(int def)
--- 
-2.4.3
-
package/lm-sensors/lm-sensors.hash +3 -1
index eeaa633f461f..40728252b49a 100644
@@ -1,2 +1,4 @@
 # Locally calculated
-sha256	e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f	lm-sensors_3.4.0.orig.tar.bz2
+sha256	f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0	lm-sensors-V3-5-0.tar.gz
+sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	COPYING
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING.LGPL
package/lm-sensors/lm-sensors.mk +2 -3
index 778a355b0f7a..cebfcdf42765 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LM_SENSORS_VERSION = 3.4.0
-LM_SENSORS_SOURCE = lm-sensors_$(LM_SENSORS_VERSION).orig.tar.bz2
-LM_SENSORS_SITE = http://snapshot.debian.org/archive/debian/20170208T211941Z/pool/main/l/lm-sensors
+LM_SENSORS_VERSION = V3-5-0
+LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,$(LM_SENSORS_VERSION))
 LM_SENSORS_INSTALL_STAGING = YES
 LM_SENSORS_DEPENDENCIES = host-bison host-flex
 LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs)
Signature · 1 line
2.19.2
#4 lore raw

PATCH 1/3 lm-sensors: remove redundant BUILD_STATIC_LIB build parameter

In reply to Baruch Siach

Hi Baruch,

Le 27/12/2018 ? 11:13, Baruch Siach a ?crit?:

Quoted 4 lines

Commit 3e05efd76636 ("package/lm-sensors: disable static library for shared-only build") added BUILD_STATIC_LIB to LM_SENSORS_MAKE_OPTS with value that depends on BR2_SHARED_LIBS, but forgot to remove it from the common LM_SENSORS_MAKE_OPTS. Fix that.

IIRC, this patch was part of a series fixing packages that build a static library when BR2_SHARED_LIBS is set. I had a special hook checking if a package install a *.a file to STAGING_DIR.
But this effort was stopped since there is some corner case where a .a file is needed:

http://lists.busybox.net/pipermail/buildroot/2015-January/116736.html

But, we still have a case where a package A install a shared and a static library and a package B that depend on package A can choose to link against the shared or the static library.

Acked-by Romain Naour <[email protected]>

Best regards,
Romain

Quoted 20 lines
Cc Romain Naour <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/lm-sensors/lm-sensors.mk | 1 -
 1 file changed, 1 deletion(-)
package/lm-sensors/lm-sensors.mk +0 -1
index 6fc7ce4981c9..778a355b0f7a 100644
@@ -21,7 +21,6 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
 LM_SENSORS_MAKE_OPTS = \
-	BUILD_STATIC_LIB=1 \
 	MACHINE=$(KERNEL_ARCH) \
 	PREFIX=/usr
#5 lore raw

PATCH 1/3 lm-sensors: remove redundant BUILD_STATIC_LIB build parameter

Hello,

Quoted 6 lines · Romain Naour

Le 27/12/2018 ? 11:13, Baruch Siach a ?crit?:

Quoted 4 lines

Commit 3e05efd76636 ("package/lm-sensors: disable static library for shared-only build") added BUILD_STATIC_LIB to LM_SENSORS_MAKE_OPTS with value that depends on BR2_SHARED_LIBS, but forgot to remove it from the common LM_SENSORS_MAKE_OPTS. Fix that.

Quoted 7 lines

IIRC, this patch was part of a series fixing packages that build a static library when BR2_SHARED_LIBS is set. I had a special hook checking if a package install a *.a file to STAGING_DIR.
But this effort was stopped since there is some corner case where a .a file is needed:

http://lists.busybox.net/pipermail/buildroot/2015-January/116736.html

Are you pointing to the right e-mail? This e-mail is not at all saying that there are some corner cases where a .a file is needed. All what I was saying in this e-mail is: is it really worth patching / adding more complexity to lots of packages just to make sure they don't build/install a static library when BR2_SHARED_LIBS=y.

Quoted 3 lines

But, we still have a case where a package A install a shared and a static library and a package B that depend on package A can choose to link against the shared or the static library.

I don't follow you here :-/

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#6 lore raw

PATCH 1/3 lm-sensors: remove redundant BUILD_STATIC_LIB build parameter

In reply to Romain Naour

Hi Romain,

Quoted 12 lines · Romain Naour

Le 27/12/2018 ? 11:13, Baruch Siach a ?crit?:

Quoted 4 lines

Commit 3e05efd76636 ("package/lm-sensors: disable static library for shared-only build") added BUILD_STATIC_LIB to LM_SENSORS_MAKE_OPTS with value that depends on BR2_SHARED_LIBS, but forgot to remove it from the common LM_SENSORS_MAKE_OPTS. Fix that.

IIRC, this patch was part of a series fixing packages that build a static library when BR2_SHARED_LIBS is set. I had a special hook checking if a package install a *.a file to STAGING_DIR.
But this effort was stopped since there is some corner case where a .a file is needed:

Quoted 7 lines

http://lists.busybox.net/pipermail/buildroot/2015-January/116736.html

But, we still have a case where a package A install a shared and a static library and a package B that depend on package A can choose to link against the shared or the static library.

Acked-by Romain Naour <[email protected]>

Thanks.

I should have probably mentioned that this patch makes no functional change. The BUILD_STATIC_LIB assignment below overrides this one. So this is only about removing the redundancy.

baruch

Quoted 17 lines
Quoted 17 lines
Cc Romain Naour <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/lm-sensors/lm-sensors.mk | 1 -
 1 file changed, 1 deletion(-)
package/lm-sensors/lm-sensors.mk +0 -1
index 6fc7ce4981c9..778a355b0f7a 100644
@@ -21,7 +21,6 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
 LM_SENSORS_MAKE_OPTS = \
-	BUILD_STATIC_LIB=1 \
 	MACHINE=$(KERNEL_ARCH) \
 	PREFIX=/usr
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#7 lore raw

PATCH 1/3 lm-sensors: remove redundant BUILD_STATIC_LIB build parameter

In reply to Baruch Siach

Hello,

Quoted 10 lines · Baruch Siach

Commit 3e05efd76636 ("package/lm-sensors: disable static library for shared-only build") added BUILD_STATIC_LIB to LM_SENSORS_MAKE_OPTS with value that depends on BR2_SHARED_LIBS, but forgot to remove it from the common LM_SENSORS_MAKE_OPTS. Fix that.

Cc Romain Naour <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/lm-sensors/lm-sensors.mk | 1 -
 1 file changed, 1 deletion(-)

Series applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com