|

»

[PATCH 0/2] Fixes for Fedora

View: New views

9 Messages — Rating Filter: Alert me

	[PATCH 0/2] Fixes for Fedora by Felipe Contreras :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Currently dpkg doesn't build on Fedora, and these patches fix that. I sent these a long time ago to Guillem but it looks like they fell through the cracks. Felipe Contreras (2): Fix build when selinux pkg-config is not available Fix build when po4a is not available Makefile.am \| 6 +++++- configure.ac \| 3 +++ m4/libs.m4 \| 14 +++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...
	[PATCH 1/2] Fix build when selinux pkg-config is not available by Felipe Contreras :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Signed-off-by: Felipe Contreras <felipe.contreras@...> --- m4/libs.m4 \| 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/m4/libs.m4 b/m4/libs.m4 index 255a7ef..a99afbe 100644 --- a/m4/libs.m4 +++ b/m4/libs.m4 @@ -70,10 +70,18 @@ if test "x$with_selinux" != "xno"; then AC_CHECK_LIB([selinux], [is_selinux_enabled], [AC_DEFINE(WITH_SELINUX, 1, [Define to 1 to compile in SELinux support]) - if test "x$with_selinux" = "xstatic"; then - dpkg_selinux_libs="-Wl,-Bstatic "$(pkg-config --static --libs libselinux)" -Wl,-Bdynamic" + if test $(pkg-config --exists libselinux); then + if test "x$with_selinux" = "xstatic"; then + dpkg_selinux_libs="-Wl,-Bstatic "$(pkg-config --static --libs libselinux)" -Wl,-Bdynamic" + else + dpkg_selinux_libs=$(pkg-config --libs libselinux) + fi else - dpkg_selinux_libs=$(pkg-config --libs libselinux) + if test "x$with_selinux" = "xstatic"; then + dpkg_selinux_libs="-Wl,-Bstatic -lselinux -Wl,-Bdynamic" + else + dpkg_selinux_libs="-lselinux" + fi fi SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS }$dpkg_selinux_libs" with_selinux="yes"], -- 1.6.5.1 -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...
	[PATCH 2/2] Fix build when po4a is not available by Felipe Contreras :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Signed-off-by: Felipe Contreras <felipe.contreras@...> --- Makefile.am \| 6 +++++- configure.ac \| 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8fe8726..aaa7d85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,10 @@ if WITH_DSELECT MAYBE_DSELECT = dselect endif +if WITH_PO4A + MAYBE_MAN = man +endif + SUBDIRS = \ lib \ dpkg-deb \ @@ -13,7 +17,7 @@ SUBDIRS = \ $(MAYBE_DSELECT) \ scripts \ po \ - man + $(MAYBE_MAN) ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 52f019c..67bba57 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,9 @@ AC_PROG_LEX AC_PROG_RANLIB DPKG_PROG_PERL +AC_CHECK_PROG([PO4A], [po4a]) +AM_CONDITIONAL([WITH_PO4A], [test -n "$PO4A"]) + # Checks for operating system services and capabilities. AC_SYS_LARGEFILE -- 1.6.5.1 -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...
	Re: [PATCH 1/2] Fix build when selinux pkg-config is not available by Tollef Fog Heen :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message ]] Felipe Contreras \| - if test "x$with_selinux" = "xstatic"; then \| - dpkg_selinux_libs="-Wl,-Bstatic "$(pkg-config --static --libs libselinux)" -Wl,-Bdynamic" \| + if test $(pkg-config --exists libselinux); then This makes it impossible to override the location of pkg-config by setting PKG_CONFIG. Please use the PKG_CHECK_MODULES macro (or at least the PKG_PROG_PKG_CONFIG macro and then call $PKG_CONFIG yourself). (Yes, I know that the old code has the same problem.) -- Tollef Fog Heen UNIX is user friendly, it's just picky about who its friends are -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...
	Re: [PATCH 0/2] Fixes for Fedora by Jonathan Nieder :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Felipe Contreras wrote: > Currently dpkg doesn't build on Fedora, and these patches fix that. > > I sent these a long time ago to Guillem but it looks like they fell through the > cracks. > > Felipe Contreras (2): > Fix build when selinux pkg-config is not available > Fix build when po4a is not available > > Makefile.am \| 6 +++++- > configure.ac \| 3 +++ > m4/libs.m4 \| 14 +++++++++++--- > 3 files changed, 19 insertions(+), 4 deletions(-) Reviewed-by: Jonathan Nieder <jrnieder@...> -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...
	Re: [PATCH 2/2] Fix build when po4a is not available by Guillem Jover :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Hi! On Sun, 2009-10-25 at 15:40:16 +0200, Felipe Contreras wrote: > diff --git a/Makefile.am b/Makefile.am > index 8fe8726..aaa7d85 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -4,6 +4,10 @@ if WITH_DSELECT > MAYBE_DSELECT = dselect > endif > > +if WITH_PO4A > + MAYBE_MAN = man > +endif > + > SUBDIRS = \ > lib \ > dpkg-deb \ > @@ -13,7 +17,7 @@ SUBDIRS = \ > $(MAYBE_DSELECT) \ > scripts \ > po \ > - man > + $(MAYBE_MAN) > > ACLOCAL_AMFLAGS = -I m4 > > diff --git a/configure.ac b/configure.ac > index 52f019c..67bba57 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -59,6 +59,9 @@ AC_PROG_LEX > AC_PROG_RANLIB > DPKG_PROG_PERL > > +AC_CHECK_PROG([PO4A], [po4a]) > +AM_CONDITIONAL([WITH_PO4A], [test -n "$PO4A"]) > + > # Checks for operating system services and capabilities. > AC_SYS_LARGEFILE The problem with this patch is that it disables man pages completely when there's no po4a, it also does not honour the NLS setting. I've pushed this instead: <http://git.debian.org/?p=dpkg/dpkg.git;a=commit;h=679d1d75> Thanks! regards, guillem -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...
	Re: [PATCH 0/2] Fixes for Fedora by Guillem Jover :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Hi! On Sun, 2009-10-25 at 15:40:14 +0200, Felipe Contreras wrote: > Currently dpkg doesn't build on Fedora, and these patches fix that. > > I sent these a long time ago to Guillem but it looks like they fell > through the cracks. Yeah, had them around but had forgotten about them, sorry. > Felipe Contreras (2): > Fix build when selinux pkg-config is not available Didn't get this one, so I fished it from the web archive. I've added the needed -lsepol to the static non-pkg-config case. Pushed, thanks! regards, guillem -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...
	Re: [PATCH 1/2] Fix build when selinux pkg-config is not available by Guillem Jover :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Hi! On Sun, 2009-10-25 at 22:40:26 +0100, Tollef Fog Heen wrote: > ]] Felipe Contreras > > \| - if test "x$with_selinux" = "xstatic"; then > \| - dpkg_selinux_libs="-Wl,-Bstatic "$(pkg-config --static --libs libselinux)" -Wl,-Bdynamic" > \| + if test $(pkg-config --exists libselinux); then > > This makes it impossible to override the location of pkg-config by > setting PKG_CONFIG. Please use the PKG_CHECK_MODULES macro (or at least > the PKG_PROG_PKG_CONFIG macro and then call $PKG_CONFIG yourself). > > (Yes, I know that the old code has the same problem.) Ah, right, my fault, fixed it now, thanks! regards, guillem -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...
	Re: [PATCH 0/2] Fixes for Fedora by Felipe Contreras :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message On Fri, Oct 30, 2009 at 4:19 PM, Guillem Jover <guillem@...> wrote: > Didn't get this one, so I fished it from the web archive. I've added > the needed -lsepol to the static non-pkg-config case. > > Pushed, thanks! Thanks, it builds fine now :) -- Felipe Contreras -- To UNSUBSCRIBE, email to debian-dpkg-REQUEST@... with a subject of "unsubscribe". Trouble? Contact listmaster@...