* [PATCH 1/2] build: also use libtool for install stage
2013-01-10 15:15 iptables: build fixes Jan Engelhardt
@ 2013-01-10 15:15 ` Jan Engelhardt
2013-01-10 15:15 ` [PATCH 2/2] build: do not dereference symlinks on installation Jan Engelhardt
2013-01-12 2:49 ` iptables: build fixes Dmitry V. Levin
2 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2013-01-10 15:15 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
The just-built library has DT_RPATH entries to be runnable from
whereever it is. If we just install that, the distro build systems
will throw warnings like
(Open Build Service) ERROR: RPATH
"/home/abuild/rpmbuild/BUILD/iptables-1.4.17a/libxtables/.libs"
on /home/abuild/rpmbuild/BUILDROOT/iptables-1.4.17a-0.x86_64/usr/lib64/xtables/libxt_unclean.so
is not allowed
These RPATH entries are indeed undesired for libraries is in a system
location, which is why libtool produces another copy of the library on
installation. The makefile however missed using libtool during
installation (introduced with commit v1.4.17-1-g68e77a2).
This patch now resolves this.
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
extensions/GNUmakefile.in | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index adad4d6..e520c86 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -49,6 +49,9 @@ pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
pfx_objs := $(patsubst %,libxt_%.o,${pfx_build_mod})
pf4_objs := $(patsubst %,libipt_%.o,${pf4_build_mod})
pf6_objs := $(patsubst %,libip6t_%.o,${pf6_build_mod})
+pfx_lalibs := $(patsubst %,libxt_%.la,${pfx_build_mod})
+pf4_lalibs := $(patsubst %,libipt_%.la,${pf4_build_mod})
+pf6_lalibs := $(patsubst %,libip6t_%.la,${pf6_build_mod})
pfx_solibs := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
pf4_solibs := $(patsubst %,libipt_%.so,${pf4_build_mod})
pf6_solibs := $(patsubst %,libip6t_%.so,${pf6_build_mod})
@@ -63,7 +66,8 @@ targets_install :=
@ENABLE_STATIC_TRUE@ libext4_objs := ${pf4_objs}
@ENABLE_STATIC_TRUE@ libext6_objs := ${pf6_objs}
@ENABLE_STATIC_FALSE@ targets += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
-@ENABLE_STATIC_FALSE@ targets_install += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
+@ENABLE_STATIC_FALSE@ targets_la_install += ${pfx_lalibs} ${pf4_lalibs} ${pf6_lalibs}
+@ENABLE_STATIC_FALSE@ targets_so_install += ${pfx_solibs}
.SECONDARY:
@@ -71,9 +75,11 @@ targets_install :=
all: ${targets}
-install: ${targets_install}
+install: ${targets_la_install} ${targets_so_install}
@mkdir -p "${DESTDIR}${xtlibdir}";
- if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
+ ${AM_VERBOSE_NULL} ../libtool ${AM_LIBTOOL_SILENT} --mode=install install -pm0755 ${targets_la_install} "${DESTDIR}${xtlibdir}/"
+ rm -f "${DESTDIR}${xtlibdir}"/*.la;
+ install -pm0755 ${targets_so_install} "${DESTDIR}${xtlibdir}/"
clean:
rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
@@ -94,7 +100,7 @@ lib%.so: lib%.la
${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
lib%.la: lib%.lo
- ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
+ ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -avoid-version -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
lib%.lo: ${srcdir}/lib%.c
${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] build: do not dereference symlinks on installation
2013-01-10 15:15 iptables: build fixes Jan Engelhardt
2013-01-10 15:15 ` [PATCH 1/2] build: also use libtool for install stage Jan Engelhardt
@ 2013-01-10 15:15 ` Jan Engelhardt
2013-01-12 2:49 ` iptables: build fixes Dmitry V. Levin
2 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2013-01-10 15:15 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
By using install(1), libxt_NOTRACK.so was inadvertently installed as
an actual file to /usr/lib/xtables rather than as a symlink. Switch to
using cp(1).
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
extensions/GNUmakefile.in | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index e520c86..15ede9f 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -52,9 +52,10 @@ pf6_objs := $(patsubst %,libip6t_%.o,${pf6_build_mod})
pfx_lalibs := $(patsubst %,libxt_%.la,${pfx_build_mod})
pf4_lalibs := $(patsubst %,libipt_%.la,${pf4_build_mod})
pf6_lalibs := $(patsubst %,libip6t_%.la,${pf6_build_mod})
-pfx_solibs := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
+pfx_solibs := $(patsubst %,libxt_%.so,${pfx_build_mod})
pf4_solibs := $(patsubst %,libipt_%.so,${pf4_build_mod})
pf6_solibs := $(patsubst %,libip6t_%.so,${pf6_build_mod})
+pfx_solinks := $(patsubst %,libxt_%.so,${pfx_symlinks})
#
@@ -65,9 +66,9 @@ targets_install :=
@ENABLE_STATIC_TRUE@ libext_objs := ${pfx_objs}
@ENABLE_STATIC_TRUE@ libext4_objs := ${pf4_objs}
@ENABLE_STATIC_TRUE@ libext6_objs := ${pf6_objs}
-@ENABLE_STATIC_FALSE@ targets += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
+@ENABLE_STATIC_FALSE@ targets += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs} ${pfx_solinks}
@ENABLE_STATIC_FALSE@ targets_la_install += ${pfx_lalibs} ${pf4_lalibs} ${pf6_lalibs}
-@ENABLE_STATIC_FALSE@ targets_so_install += ${pfx_solibs}
+@ENABLE_STATIC_FALSE@ targets_so_install += ${pfx_solinks}
.SECONDARY:
@@ -79,7 +80,9 @@ install: ${targets_la_install} ${targets_so_install}
@mkdir -p "${DESTDIR}${xtlibdir}";
${AM_VERBOSE_NULL} ../libtool ${AM_LIBTOOL_SILENT} --mode=install install -pm0755 ${targets_la_install} "${DESTDIR}${xtlibdir}/"
rm -f "${DESTDIR}${xtlibdir}"/*.la;
- install -pm0755 ${targets_so_install} "${DESTDIR}${xtlibdir}/"
+ # targets_so_install contains symlinks, and these should be preserved,
+ # so using install(1) is out of the question for them.
+ cp -a ${targets_so_install} "${DESTDIR}${xtlibdir}/"
clean:
rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: iptables: build fixes
2013-01-10 15:15 iptables: build fixes Jan Engelhardt
2013-01-10 15:15 ` [PATCH 1/2] build: also use libtool for install stage Jan Engelhardt
2013-01-10 15:15 ` [PATCH 2/2] build: do not dereference symlinks on installation Jan Engelhardt
@ 2013-01-12 2:49 ` Dmitry V. Levin
2013-03-06 0:08 ` Dmitry V. Levin
2 siblings, 1 reply; 6+ messages in thread
From: Dmitry V. Levin @ 2013-01-12 2:49 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: pablo, netfilter-devel
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
On Thu, Jan 10, 2013 at 04:15:17PM +0100, Jan Engelhardt wrote:
[...]
> Jan Engelhardt (2):
> build: also use libtool for install stage
> build: do not dereference symlinks on installation
>
> extensions/GNUmakefile.in | 21 +++++++++++++++------
> 1 file changed, 15 insertions(+), 6 deletions(-)
Acked-by: Dmitry V. Levin <ldv@altlinux.org>
--
ldv
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: iptables: build fixes
2013-01-12 2:49 ` iptables: build fixes Dmitry V. Levin
@ 2013-03-06 0:08 ` Dmitry V. Levin
2013-03-06 5:13 ` Jan Engelhardt
0 siblings, 1 reply; 6+ messages in thread
From: Dmitry V. Levin @ 2013-03-06 0:08 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo, Jan Engelhardt
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
On Sat, Jan 12, 2013 at 06:49:15AM +0400, Dmitry V. Levin wrote:
> On Thu, Jan 10, 2013 at 04:15:17PM +0100, Jan Engelhardt wrote:
> [...]
> > Jan Engelhardt (2):
> > build: also use libtool for install stage
> > build: do not dereference symlinks on installation
> >
> > extensions/GNUmakefile.in | 21 +++++++++++++++------
> > 1 file changed, 15 insertions(+), 6 deletions(-)
>
> Acked-by: Dmitry V. Levin <ldv@altlinux.org>
Any idea why these fixed didn't get into 1.4.18?
--
ldv
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: iptables: build fixes
2013-03-06 0:08 ` Dmitry V. Levin
@ 2013-03-06 5:13 ` Jan Engelhardt
0 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2013-03-06 5:13 UTC (permalink / raw)
To: Dmitry V. Levin; +Cc: netfilter-devel, pablo
On Wednesday 2013-03-06 01:08, Dmitry V. Levin wrote:
>On Sat, Jan 12, 2013 at 06:49:15AM +0400, Dmitry V. Levin wrote:
>> On Thu, Jan 10, 2013 at 04:15:17PM +0100, Jan Engelhardt wrote:
>> [...]
>> > Jan Engelhardt (2):
>> > build: also use libtool for install stage
>> > build: do not dereference symlinks on installation
>> >
>> > extensions/GNUmakefile.in | 21 +++++++++++++++------
>> > 1 file changed, 15 insertions(+), 6 deletions(-)
>>
>> Acked-by: Dmitry V. Levin <ldv@altlinux.org>
>
>Any idea why these fixed didn't get into 1.4.18?
http://www.spinics.net/lists/netfilter-devel/msg25045.html
and its reply ("Thread Next" link).
^ permalink raw reply [flat|nested] 6+ messages in thread