diff options
Diffstat (limited to 'net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch')
| -rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch | 152 |
1 files changed, 152 insertions, 0 deletions
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch b/net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch new file mode 100644 index 0000000..5e27829 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch @@ -0,0 +1,152 @@ +--- system-settings/plugins/keyfile/tests/Makefile.am.orig 2009-02-27 17:04:25.000000000 +0000 ++++ system-settings/plugins/keyfile/tests/Makefile.am 2009-02-27 17:04:33.000000000 +0000 +@@ -19,9 +19,9 @@ + + test_keyfile_LDADD = \ + $(DBUS_LIBS) \ ++ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ + $(top_builddir)/libnm-glib/libnm_glib.la \ +- $(top_builddir)/libnm-util/libnm-util.la \ +- $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la ++ $(top_builddir)/libnm-util/libnm-util.la + + if WITH_TESTS + +--- system-settings/plugins/keyfile/tests/Makefile.in.org 2009-02-27 17:23:47.000000000 +0000 ++++ system-settings/plugins/keyfile/tests/Makefile.in 2009-02-27 17:24:05.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,9 +47,9 @@ + test_keyfile_OBJECTS = $(am_test_keyfile_OBJECTS) + am__DEPENDENCIES_1 = + test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ + $(top_builddir)/libnm-glib/libnm_glib.la \ +- $(top_builddir)/libnm-util/libnm-util.la \ +- $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la ++ $(top_builddir)/libnm-util/libnm-util.la + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -93,10 +93,6 @@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DATADIRNAME = @DATADIRNAME@ + DBUS_CFLAGS = @DBUS_CFLAGS@ +@@ -107,14 +103,14 @@ + DHCP_CLIENT = @DHCP_CLIENT@ + DHCP_CLIENT_PATH = @DHCP_CLIENT_PATH@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ +@@ -162,6 +158,7 @@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ + LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ +@@ -173,6 +170,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ + LIBUDEV_LIBS = @LIBUDEV_LIBS@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +@@ -182,9 +180,14 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ + NSS_CFLAGS = @NSS_CFLAGS@ + NSS_LIBS = @NSS_LIBS@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -219,8 +222,7 @@ + abs_top_builddir = @abs_top_builddir@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -251,6 +253,7 @@ + libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -263,6 +266,7 @@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = keyfiles +@@ -283,9 +287,9 @@ + + test_keyfile_LDADD = \ + $(DBUS_LIBS) \ ++ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ + $(top_builddir)/libnm-glib/libnm_glib.la \ +- $(top_builddir)/libnm-util/libnm-util.la \ +- $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la ++ $(top_builddir)/libnm-util/libnm-util.la + + all: all-recursive + +@@ -295,8 +299,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -458,7 +462,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS |