* [Buildroot] [PATCH 1/2] libcap: rename existing patch
@ 2013-11-01 17:47 Thomas Petazzoni
2013-11-01 17:47 ` [Buildroot] [PATCH 2/2] libcap: fix static link Thomas Petazzoni
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2013-11-01 17:47 UTC (permalink / raw)
To: buildroot
libcap currently has one patch, but it is named using the old naming
strategy, which includes the package version, but not a patch
number. This commit switches this to use the new patch naming
strategy.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../{libcap-2.22-build-system.patch => libcap-01-build-system.patch} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename package/libcap/{libcap-2.22-build-system.patch => libcap-01-build-system.patch} (100%)
diff --git a/package/libcap/libcap-2.22-build-system.patch b/package/libcap/libcap-01-build-system.patch
similarity index 100%
rename from package/libcap/libcap-2.22-build-system.patch
rename to package/libcap/libcap-01-build-system.patch
--
1.8.1.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] libcap: fix static link
2013-11-01 17:47 [Buildroot] [PATCH 1/2] libcap: rename existing patch Thomas Petazzoni
@ 2013-11-01 17:47 ` Thomas Petazzoni
2013-11-02 17:59 ` Samuel Martin
` (2 more replies)
2013-11-02 17:55 ` [Buildroot] [PATCH 1/2] libcap: rename existing patch Yann E. MORIN
` (2 subsequent siblings)
3 siblings, 3 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2013-11-01 17:47 UTC (permalink / raw)
To: buildroot
With BR2_PREFER_STATIC_LINK, libcap fails to build:
http://autobuild.buildroot.net/results/619bceb3491ecd2ed4e1ae552fdb237a0ed2fa47/build-end.log
This is due to the fact that it still tries to build a shared
library. This commit fixes that by adding a patch that makes libcap
provide install-shared/install-static targets. We also now only build
the $(@D)/libcap subdirectory, so removing the build of the progs
subdirectory is no longer needed.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../libcap-02-split-static-shared-install.patch | 30 ++++++++++++++++++++++
package/libcap/libcap.mk | 27 +++++++++----------
2 files changed, 44 insertions(+), 13 deletions(-)
create mode 100644 package/libcap/libcap-02-split-static-shared-install.patch
diff --git a/package/libcap/libcap-02-split-static-shared-install.patch b/package/libcap/libcap-02-split-static-shared-install.patch
new file mode 100644
index 0000000..21e7f2a
--- /dev/null
+++ b/package/libcap/libcap-02-split-static-shared-install.patch
@@ -0,0 +1,30 @@
+libcap: split install into install-shared/install-static
+
+In order to support static only builds, split the install target into
+install-shared and install-static targets.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/libcap/Makefile
+===================================================================
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -60,11 +60,17 @@
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+ $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+
+-install: all
++install: install-shared install-static
++
++install-common:
+ mkdir -p -m 0755 $(INCDIR)/sys
+ install -m 0644 include/sys/capability.h $(INCDIR)/sys
+ mkdir -p -m 0755 $(LIBDIR)
++
++install-static: install-common
+ install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
++
++install-shared: install-common
+ install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
+ ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
+ ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 16afaef..17e2eb5 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -25,29 +25,30 @@ endif
# we don't have host-attr
HOST_LIBCAP_DEPENDENCIES =
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+LIBCAP_MAKE_TARGET = libcap.a
+LIBCAP_MAKE_INSTALL_TARGET = install-static
+else
+LIBCAP_MAKE_TARGET = all
+LIBCAP_MAKE_INSTALL_TARGET = install
+endif
+
define LIBCAP_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/libcap \
LIBATTR=$(LIBCAP_HAVE_LIBATTR) BUILD_CC="$(HOSTCC)" \
- BUILD_CFLAGS="$(HOST_CFLAGS)"
+ BUILD_CFLAGS="$(HOST_CFLAGS)" $(LIBCAP_MAKE_TARGET)
endef
define LIBCAP_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
- DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
+ DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)
endef
define LIBCAP_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
- DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
+ DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)
endef
-# progs use fork()
-define LIBCAP_DISABLE_PROGS
- $(SED) '/-C progs/d' $(@D)/Makefile
-endef
-
-LIBCAP_POST_PATCH_HOOKS += LIBCAP_DISABLE_PROGS
-
define HOST_LIBCAP_BUILD_CMDS
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
endef
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] libcap: rename existing patch
2013-11-01 17:47 [Buildroot] [PATCH 1/2] libcap: rename existing patch Thomas Petazzoni
2013-11-01 17:47 ` [Buildroot] [PATCH 2/2] libcap: fix static link Thomas Petazzoni
@ 2013-11-02 17:55 ` Yann E. MORIN
2013-11-02 18:01 ` Samuel Martin
2013-11-02 18:36 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2013-11-02 17:55 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2013-11-01 18:47 +0100, Thomas Petazzoni spake thusly:
> libcap currently has one patch, but it is named using the old naming
> strategy, which includes the package version, but not a patch
> number. This commit switches this to use the new patch naming
> strategy.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> .../{libcap-2.22-build-system.patch => libcap-01-build-system.patch} | 0
> 1 file changed, 0 insertions(+), 0 deletions(-)
> rename package/libcap/{libcap-2.22-build-system.patch => libcap-01-build-system.patch} (100%)
>
> diff --git a/package/libcap/libcap-2.22-build-system.patch b/package/libcap/libcap-01-build-system.patch
> similarity index 100%
> rename from package/libcap/libcap-2.22-build-system.patch
> rename to package/libcap/libcap-01-build-system.patch
> --
> 1.8.1.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] libcap: fix static link
2013-11-01 17:47 ` [Buildroot] [PATCH 2/2] libcap: fix static link Thomas Petazzoni
@ 2013-11-02 17:59 ` Samuel Martin
2013-11-02 18:01 ` Yann E. MORIN
2013-11-04 21:08 ` Peter Korsgaard
2 siblings, 0 replies; 8+ messages in thread
From: Samuel Martin @ 2013-11-02 17:59 UTC (permalink / raw)
To: buildroot
2013/11/1 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> With BR2_PREFER_STATIC_LINK, libcap fails to build:
>
>
> http://autobuild.buildroot.net/results/619bceb3491ecd2ed4e1ae552fdb237a0ed2fa47/build-end.log
>
> This is due to the fact that it still tries to build a shared
> library. This commit fixes that by adding a patch that makes libcap
> provide install-shared/install-static targets. We also now only build
> the $(@D)/libcap subdirectory, so removing the build of the progs
> subdirectory is no longer needed.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Regards,
--
Samuel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131102/0359c586/attachment.html>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] libcap: rename existing patch
2013-11-01 17:47 [Buildroot] [PATCH 1/2] libcap: rename existing patch Thomas Petazzoni
2013-11-01 17:47 ` [Buildroot] [PATCH 2/2] libcap: fix static link Thomas Petazzoni
2013-11-02 17:55 ` [Buildroot] [PATCH 1/2] libcap: rename existing patch Yann E. MORIN
@ 2013-11-02 18:01 ` Samuel Martin
2013-11-02 18:36 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Samuel Martin @ 2013-11-02 18:01 UTC (permalink / raw)
To: buildroot
2013/11/1 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> libcap currently has one patch, but it is named using the old naming
> strategy, which includes the package version, but not a patch
> number. This commit switches this to use the new patch naming
> strategy.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Regards,
--
Samuel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131102/368a36b3/attachment.html>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] libcap: fix static link
2013-11-01 17:47 ` [Buildroot] [PATCH 2/2] libcap: fix static link Thomas Petazzoni
2013-11-02 17:59 ` Samuel Martin
@ 2013-11-02 18:01 ` Yann E. MORIN
2013-11-04 21:08 ` Peter Korsgaard
2 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2013-11-02 18:01 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2013-11-01 18:47 +0100, Thomas Petazzoni spake thusly:
> With BR2_PREFER_STATIC_LINK, libcap fails to build:
>
> http://autobuild.buildroot.net/results/619bceb3491ecd2ed4e1ae552fdb237a0ed2fa47/build-end.log
>
> This is due to the fact that it still tries to build a shared
> library. This commit fixes that by adding a patch that makes libcap
> provide install-shared/install-static targets. We also now only build
> the $(@D)/libcap subdirectory, so removing the build of the progs
> subdirectory is no longer needed.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> .../libcap-02-split-static-shared-install.patch | 30 ++++++++++++++++++++++
> package/libcap/libcap.mk | 27 +++++++++----------
> 2 files changed, 44 insertions(+), 13 deletions(-)
> create mode 100644 package/libcap/libcap-02-split-static-shared-install.patch
>
> diff --git a/package/libcap/libcap-02-split-static-shared-install.patch b/package/libcap/libcap-02-split-static-shared-install.patch
> new file mode 100644
> index 0000000..21e7f2a
> --- /dev/null
> +++ b/package/libcap/libcap-02-split-static-shared-install.patch
> @@ -0,0 +1,30 @@
> +libcap: split install into install-shared/install-static
> +
> +In order to support static only builds, split the install target into
> +install-shared and install-static targets.
> +
> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> +
> +Index: b/libcap/Makefile
> +===================================================================
> +--- a/libcap/Makefile
> ++++ b/libcap/Makefile
> +@@ -60,11 +60,17 @@
> + cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
> + $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
> +
> +-install: all
> ++install: install-shared install-static
> ++
> ++install-common:
> + mkdir -p -m 0755 $(INCDIR)/sys
> + install -m 0644 include/sys/capability.h $(INCDIR)/sys
> + mkdir -p -m 0755 $(LIBDIR)
> ++
> ++install-static: install-common
> + install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
> ++
> ++install-shared: install-common
> + install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
> + ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
> + ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
> diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
> index 16afaef..17e2eb5 100644
> --- a/package/libcap/libcap.mk
> +++ b/package/libcap/libcap.mk
> @@ -25,29 +25,30 @@ endif
> # we don't have host-attr
> HOST_LIBCAP_DEPENDENCIES =
>
> +ifeq ($(BR2_PREFER_STATIC_LIB),y)
> +LIBCAP_MAKE_TARGET = libcap.a
> +LIBCAP_MAKE_INSTALL_TARGET = install-static
> +else
> +LIBCAP_MAKE_TARGET = all
> +LIBCAP_MAKE_INSTALL_TARGET = install
> +endif
> +
> define LIBCAP_BUILD_CMDS
> - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
> + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/libcap \
> LIBATTR=$(LIBCAP_HAVE_LIBATTR) BUILD_CC="$(HOSTCC)" \
> - BUILD_CFLAGS="$(HOST_CFLAGS)"
> + BUILD_CFLAGS="$(HOST_CFLAGS)" $(LIBCAP_MAKE_TARGET)
> endef
>
> define LIBCAP_INSTALL_STAGING_CMDS
> - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
> - DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install
> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
> + DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)
> endef
>
> define LIBCAP_INSTALL_TARGET_CMDS
> - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
> - DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install
> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
> + DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)
> endef
>
> -# progs use fork()
> -define LIBCAP_DISABLE_PROGS
> - $(SED) '/-C progs/d' $(@D)/Makefile
> -endef
> -
> -LIBCAP_POST_PATCH_HOOKS += LIBCAP_DISABLE_PROGS
> -
> define HOST_LIBCAP_BUILD_CMDS
> $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
> endef
> --
> 1.8.1.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] libcap: rename existing patch
2013-11-01 17:47 [Buildroot] [PATCH 1/2] libcap: rename existing patch Thomas Petazzoni
` (2 preceding siblings ...)
2013-11-02 18:01 ` Samuel Martin
@ 2013-11-02 18:36 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2013-11-02 18:36 UTC (permalink / raw)
To: buildroot
Dear Thomas Petazzoni,
On Fri, 1 Nov 2013 18:47:26 +0100, Thomas Petazzoni wrote:
> libcap currently has one patch, but it is named using the old naming
> strategy, which includes the package version, but not a patch
> number. This commit switches this to use the new patch naming
> strategy.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> .../{libcap-2.22-build-system.patch => libcap-01-build-system.patch} | 0
> 1 file changed, 0 insertions(+), 0 deletions(-)
> rename package/libcap/{libcap-2.22-build-system.patch => libcap-01-build-system.patch} (100%)
>
> diff --git a/package/libcap/libcap-2.22-build-system.patch b/package/libcap/libcap-01-build-system.patch
> similarity index 100%
> rename from package/libcap/libcap-2.22-build-system.patch
> rename to package/libcap/libcap-01-build-system.patch
Committed both patches to for-peter-2013.11, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] libcap: fix static link
2013-11-01 17:47 ` [Buildroot] [PATCH 2/2] libcap: fix static link Thomas Petazzoni
2013-11-02 17:59 ` Samuel Martin
2013-11-02 18:01 ` Yann E. MORIN
@ 2013-11-04 21:08 ` Peter Korsgaard
2 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2013-11-04 21:08 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> With BR2_PREFER_STATIC_LINK, libcap fails to build:
The symbol is called BR2_PREFER_STATIC_LIB.
> http://autobuild.buildroot.net/results/619bceb3491ecd2ed4e1ae552fdb237a0ed2fa47/build-end.log
> This is due to the fact that it still tries to build a shared
> library. This commit fixes that by adding a patch that makes libcap
> provide install-shared/install-static targets. We also now only build
> the $(@D)/libcap subdirectory, so removing the build of the progs
> subdirectory is no longer needed.
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> .../libcap-02-split-static-shared-install.patch | 30 ++++++++++++++++++++++
Don't forget to send the patch upstream.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-11-04 21:08 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-01 17:47 [Buildroot] [PATCH 1/2] libcap: rename existing patch Thomas Petazzoni
2013-11-01 17:47 ` [Buildroot] [PATCH 2/2] libcap: fix static link Thomas Petazzoni
2013-11-02 17:59 ` Samuel Martin
2013-11-02 18:01 ` Yann E. MORIN
2013-11-04 21:08 ` Peter Korsgaard
2013-11-02 17:55 ` [Buildroot] [PATCH 1/2] libcap: rename existing patch Yann E. MORIN
2013-11-02 18:01 ` Samuel Martin
2013-11-02 18:36 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox