Package: scli Version: 0.4.0-2 Severity: normal Tags: patch User: [email protected] Usertags: origin-ubuntu quantal ubuntu-patch
In ubuntu scli fails to build due to changes in glib and the linkerflag --as-needed Attached patch was applied to fix the issues. While they are not required in debian right now, they make the build more robust and might also be required in future in debian. It would be appreciated if the patch could be applied in debian.
Description: Add GLIB_CFLAGS where they're needed. It is necessary because include path for glib may differ from paths for other headers. Also link with used gthread. Author: Ilya Barygin <[email protected]> Bug-Ubuntu: https://launchpad.net/bugs/756098 --- a/configure +++ b/configure @@ -3666,7 +3666,7 @@ pkg_config_args=glib-2.0 - for module in . gmodule + for module in . gmodule gthread do case "$module" in gmodule) @@ -4161,8 +4161,8 @@ if test "x$enable_gnettest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GNET_CFLAGS" - LIBS="$GNET_LIBS $LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS $GNET_CFLAGS" + LIBS="$GNET_LIBS $GLIB_LIBS $LIBS" rm -f conf.gnettest if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" --- a/aclocal.m4 +++ b/aclocal.m4 @@ -284,8 +284,8 @@ if test "x$enable_gnettest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GNET_CFLAGS" - LIBS="$GNET_LIBS $LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS $GNET_CFLAGS" + LIBS="$GNET_LIBS $GLIB_LIBS $LIBS" dnl dnl Now check if the installed GNET is sufficiently new. (Also sanity dnl checks the results of pkg-config to some extent) --- a/stub/Makefile.am +++ b/stub/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) +AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) MIBS = IF-MIB \ IANAifType-MIB \ --- a/stub/Makefile.in +++ b/stub/Makefile.in @@ -189,7 +189,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) +AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) MIBS = IF-MIB \ IANAifType-MIB \ IP-MIB \ --- a/proc/Makefile.am +++ b/proc/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) -I$(top_srcdir)/stub +AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/stub PROCS = if-mib-proc.h if-mib-proc.c \ rapid-city-proc.h rapid-city-proc.c \ --- a/proc/Makefile.in +++ b/proc/Makefile.in @@ -172,7 +172,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) -I$(top_srcdir)/stub +AM_CPPFLAGS = $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/stub PROCS = if-mib-proc.h if-mib-proc.c \ rapid-city-proc.h rapid-city-proc.c \ productmib-proc.h productmib-proc.c \ --- a/scli/Makefile.am +++ b/scli/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/stub -I$(top_srcdir)/proc $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/stub -I$(top_srcdir)/proc $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS) EXTRA_DIST = oui.c --- a/scli/Makefile.in +++ b/scli/Makefile.in @@ -181,7 +181,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CPPFLAGS = -I$(top_srcdir)/stub -I$(top_srcdir)/proc $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/stub -I$(top_srcdir)/proc $(GSNMP_CFLAGS) $(GNET_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS) EXTRA_DIST = oui.c scli_SOURCES = scli.c scli.h scli.1 vendors.c \ basic.c monitor.c cmds.c thread.c \ --- a/configure.in +++ b/configure.in @@ -33,7 +33,7 @@ dnl Checks for libraries. -AM_PATH_GLIB_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule) +AM_PATH_GLIB_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule gthread) AM_PATH_GNET_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GNET)) dnl AM_PATH_GLIB(1.2.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule) dnl AM_PATH_GTK(1.2.0, [], AC_MSG_ERROR(scli needs GTK))
signature.asc
Description: OpenPGP digital signature
