From: cshore Date: Tue, 14 Feb 2012 17:34:08 +0000 (+0000) Subject: [packages] Mass Fix for GCC 4.6 X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=fc8c6d10f36323fa4f430aa78d1c82042966a250;p=packages.git [packages] Mass Fix for GCC 4.6 nodefaultlibs now includes libc so we have to add it where we want it git-svn-id: svn://svn.openwrt.org/openwrt/packages@30530 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/ipv6/gw6c/Makefile b/ipv6/gw6c/Makefile index 57beb3232..71550fcae 100644 --- a/ipv6/gw6c/Makefile +++ b/ipv6/gw6c/Makefile @@ -56,7 +56,7 @@ define Build/Compile -I$(PKG_BUILD_DIR)/tspc-advanced/platform/openwrt -I$(PKG_BUILD_DIR)/tspc-advanced" \ LDFLAGS="-L$(PKG_BUILD_DIR)/tspc-advanced/gw6cconfig \ -L$(PKG_BUILD_DIR)/tspc-advanced/gw6cmessaging \ - $(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ $(LIBGCC_S)" \ + $(TARGET_LDFLAGS) -nodefaultlibs -lc -luClibc++ $(LIBGCC_S)" \ target="openwrt" \ installdir="$(PKG_INSTALL_DIR)" endef diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile index fe09448bc..5de77f52c 100644 --- a/ipv6/miredo/Makefile +++ b/ipv6/miredo/Makefile @@ -66,7 +66,7 @@ CONFIGURE_ARGS += \ CONFIGURE_VARS += \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ - LIBS="-nodefaultlibs -luClibc++ -lm" \ + LIBS="-nodefaultlibs -lc -luClibc++ -lm" \ ac_cv_file__proc_self_maps=yes\ # XXX: override (:=), don't append (+=) diff --git a/ipv6/ndppd/Makefile b/ipv6/ndppd/Makefile index 08ccc76ec..270f84b3f 100644 --- a/ipv6/ndppd/Makefile +++ b/ipv6/ndppd/Makefile @@ -47,7 +47,7 @@ define Build/Compile CXXFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS) -fno-builtin -fno-rtti -nostdinc++ \ -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - LIBS="-nodefaultlibs -luClibc++ -lconfuse" \ + LIBS="-nodefaultlibs -lc -luClibc++ -lconfuse" \ ndppd endef diff --git a/libs/fcgi/Makefile b/libs/fcgi/Makefile index 330c0d209..26487c53e 100644 --- a/libs/fcgi/Makefile +++ b/libs/fcgi/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ARGS += \ CONFIGURE_VARS += \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ - LIBS="-nodefaultlibs -luClibc++ -lm" \ + LIBS="-nodefaultlibs -lc -luClibc++ -lm" \ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include diff --git a/libs/id3lib/Makefile b/libs/id3lib/Makefile index 24ec47ac6..6b6ba8868 100644 --- a/libs/id3lib/Makefile +++ b/libs/id3lib/Makefile @@ -36,7 +36,7 @@ CONFIGURE_ARGS += \ #CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti" \ - LIBS="-nodefaultlibs -lz -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \ + LIBS="-nodefaultlibs -lc -lz -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include diff --git a/libs/ustl/files/Common.mk b/libs/ustl/files/Common.mk index 56f049dd1..ab0cdf5a0 100644 --- a/libs/ustl/files/Common.mk +++ b/libs/ustl/files/Common.mk @@ -38,7 +38,7 @@ BUILD_SHARED = 1 BUILD_STATIC = 1 #DEBUG = 1 #PROFILE = 1 -STANDALONE = -nodefaultlibs +STANDALONE = -nodefaultlibs CFLAGS = \ ${CUSTOMINCDIR} ${OPTFLAGS} ${CWARNOPTS} ${STANDALONE} diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile index d3496a9dd..fa4488cb8 100644 --- a/mail/xmail/Makefile +++ b/mail/xmail/Makefile @@ -37,7 +37,7 @@ define Build/Compile $(TARGET_CONFIGURE_OPTS) \ LD="\$$$$(CC)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \ - LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lcrypto -lssl -luClibc++ -ldl -lm -lpthread $(LIBGCC_S)" \ + LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc -lcrypto -lssl -luClibc++ -ldl -lm -lpthread $(LIBGCC_S)" \ all tar -cjf $(PKG_BUILD_DIR)/MailRoot.tar.bz2 -C $(PKG_BUILD_DIR)/MailRoot --exclude bin . endef diff --git a/multimedia/peercast/Makefile b/multimedia/peercast/Makefile index dc16a933e..ee56f265f 100644 --- a/multimedia/peercast/Makefile +++ b/multimedia/peercast/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS += \ CONFIGURE_VARS += \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ - LIBS="-nodefaultlibs -luClibc++ -lpthread" \ + LIBS="-nodefaultlibs -lc -luClibc++ -lpthread" \ define Package/peercast/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/multimedia/qc-usb/Makefile b/multimedia/qc-usb/Makefile index 07248dc42..0d1202bfa 100644 --- a/multimedia/qc-usb/Makefile +++ b/multimedia/qc-usb/Makefile @@ -64,7 +64,7 @@ ifneq ($(CONFIG_PACKAGE_kmod-video-quickcam),) ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ CC="$(TARGET_CC)" \ - LD="$(TARGET_CC) -nodefaultlibs -nostartfiles" \ + LD="$(TARGET_CC) -nodefaultlibs -lc -nostartfiles" \ USER_OPT="$(KERNEL_C_OPTS)" \ quickcam.$(LINUX_KMOD_SUFFIX) endef diff --git a/net/cbtt/Makefile b/net/cbtt/Makefile index f299acc51..19930925d 100644 --- a/net/cbtt/Makefile +++ b/net/cbtt/Makefile @@ -44,7 +44,7 @@ $(STAMP_BUILT)-$(2): $(STAMP_PREPARED) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -nostdinc++" \ - LFLAGS="$(TARGET_LDFLAGS) -L. -nodefaultlibs $(4) -lz -luClibc++ -lm -lpthread $(LIBGCC_S)" \ + LFLAGS="$(TARGET_LDFLAGS) -L. -nodefaultlibs -lc $(4) -lz -luClibc++ -lm -lpthread $(LIBGCC_S)" \ $(3) touch $$@ diff --git a/net/ctorrent/Makefile b/net/ctorrent/Makefile index 522fea564..a3e54cbd3 100644 --- a/net/ctorrent/Makefile +++ b/net/ctorrent/Makefile @@ -62,7 +62,7 @@ endef CONFIGURE_VARS += \ CXX="g++-uc" \ CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \ - LIBS="-nodefaultlibs -luClibc++ $(LIBGCC_S) -lc" + LIBS="-nodefaultlibs -lc -luClibc++ $(LIBGCC_S) -lc" ifeq ($(BUILD_VARIANT),ssl) CONFIGURE_ARGS += \ diff --git a/net/dansguardian/Makefile b/net/dansguardian/Makefile index 59aadec15..b3322aba3 100644 --- a/net/dansguardian/Makefile +++ b/net/dansguardian/Makefile @@ -37,7 +37,7 @@ CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ LDFLAGS="$$$$LDFLAGS" \ - LIBS="-nodefaultlibs -luClibc++ -lpthread $(LIBGCC_S)" \ + LIBS="-nodefaultlibs -lc -luClibc++ -lpthread $(LIBGCC_S)" \ define Build/Configure $(call Build/Configure/Default,\ diff --git a/net/imsnif/Makefile b/net/imsnif/Makefile index bb0524323..b102486eb 100644 --- a/net/imsnif/Makefile +++ b/net/imsnif/Makefile @@ -42,7 +42,7 @@ define Build/Compile $(PKG_BUILD_DIR)/src/util.cpp \ $(PKG_BUILD_DIR)/src/msn_conntrack.cpp \ $(PKG_BUILD_DIR)/src/msn_handlers.cpp \ - -L$(STAGING_DIR)/usr/lib -nodefaultlibs -luClibc++ $(LIBGCC_S) -lpcap \ + -L$(STAGING_DIR)/usr/lib -nodefaultlibs -lc -luClibc++ $(LIBGCC_S) -lpcap \ $(PKG_BUILD_DIR)/src/pcap_stuff.cpp endef diff --git a/net/kismet/Makefile b/net/kismet/Makefile index ebeb0ff2f..1b9b6896b 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -85,7 +85,7 @@ CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ LDFLAGS="$$$$LDFLAGS" \ - LIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S)" \ + LIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S)" \ CLIENTCLIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S)" \ libnl1_LIBS="-libnl-tiny" diff --git a/net/lftp/Makefile b/net/lftp/Makefile index 590b3d7b7..fa21a825d 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -49,7 +49,7 @@ CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ LDFLAGS="$$$$LDFLAGS" \ - LIBS="-nodefaultlibs -lz -lutil -lc -luClibc++ -lcurses $(LIBGCC_S) -ldl" \ + LIBS="-nodefaultlibs -lc -lz -lutil -lc -luClibc++ -lcurses $(LIBGCC_S) -ldl" \ i_cv_posix_fallocate_works=no MAKE_VARS += \ diff --git a/net/rrs/Makefile b/net/rrs/Makefile index 4ff8441f4..3184f7e4c 100644 --- a/net/rrs/Makefile +++ b/net/rrs/Makefile @@ -48,7 +48,7 @@ $(STAMP_BUILT)-$(2): $(STAMP_PREPARED) $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \ - LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs $(4) -luClibc++ -lm -lutil" \ + LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc $(4) -luClibc++ -lm -lutil" \ LDFLAGSNOSSL="$(TARGET_LDFLAGS) -nodefaultlibs $(4) -luClibc++ -lm -lutil" \ $(3) ( cd $(PKG_BUILD_DIR); mv -f rrs rrs-$(2); ) diff --git a/net/sipp/Makefile b/net/sipp/Makefile index 31a48a349..8fec8d291 100644 --- a/net/sipp/Makefile +++ b/net/sipp/Makefile @@ -47,7 +47,7 @@ define Build/Compile CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS_linux="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \ LFLAGS_linux="$(TARGET_LDFLAGS)" \ - LIBS="-nodefaultlibs -lncurses -luClibc++ -ldl -lpthread -lm $(LIBGCC_S)" \ + LIBS="-nodefaultlibs -lc -lncurses -luClibc++ -ldl -lpthread -lm $(LIBGCC_S)" \ all endef diff --git a/net/stun/Makefile b/net/stun/Makefile index e7090bf66..904a81b93 100644 --- a/net/stun/Makefile +++ b/net/stun/Makefile @@ -59,7 +59,7 @@ define Build/Compile DESTDIR="$(PKG_INSTALL_DIR)" \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ $(TARGET_CPPFLAGS)" \ - LDFLAGS="$$$$LDFLAGS $(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ $(LIBGCC_S)" \ + LDFLAGS="$$$$LDFLAGS $(TARGET_LDFLAGS) -nodefaultlibs -lc -luClibc++ $(LIBGCC_S)" \ all endef diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile index 057bfaed3..c48ecff9e 100644 --- a/net/vncrepeater/Makefile +++ b/net/vncrepeater/Makefile @@ -43,7 +43,7 @@ endef define Build/Compile $(call Build/Compile/Default, \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \ - LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ -lc $(LIBGCC_S)" \ + LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc -luClibc++ -lc $(LIBGCC_S)" \ repeater \ ) endef diff --git a/net/yate/Makefile b/net/yate/Makefile index e8558d939..f7d472e59 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -106,7 +106,7 @@ CONFIGURE_ARGS+= \ CONFIGURE_VARS+= \ CFLAGS="$$$$CFLAGS -nostdinc++" \ LDFLAGS="$$$$LDFLAGS -nodefaultlibs" \ - LIBS="-luClibc++ -lpthread -lresolv -ldl -lm -lc $(LIBGCC_S)" + LIBS="-lc -luClibc++ -lpthread -lresolv -ldl -lm -lc $(LIBGCC_S)" define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib diff --git a/net/znc/Makefile b/net/znc/Makefile index 2ad7511f7..4df9fe02d 100644 --- a/net/znc/Makefile +++ b/net/znc/Makefile @@ -269,7 +269,7 @@ CONFIGURE_VARS += \ CXX="$(STAGING_DIR)/host/bin/g++-uc" \ CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LIBS="-luClibc++ -lm -lssl -lcrypto $(LIBGCC_S) -lc" CONFIGURE_ARGS += \ diff --git a/utils/avrusbboot/Makefile b/utils/avrusbboot/Makefile index 59a43e4b5..378b07655 100644 --- a/utils/avrusbboot/Makefile +++ b/utils/avrusbboot/Makefile @@ -41,7 +41,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR)/software \ CXX="$(TARGET_CROSS)g++ $(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++ $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++" \ - LFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ -lc -lusb $(LIBGCC_S)" \ + LFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc -luClibc++ -lc -lusb $(LIBGCC_S)" \ all endef diff --git a/utils/gnuplot/Makefile b/utils/gnuplot/Makefile index 80cc80f77..ba1991266 100644 --- a/utils/gnuplot/Makefile +++ b/utils/gnuplot/Makefile @@ -26,7 +26,7 @@ TARGET_LDFLAGS+= \ CONFIGURE_VARS += \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ - LIBS="-nodefaultlibs -luClibc++ -lpthread $(LIBGCC_S)" + LIBS="-nodefaultlibs -lc -luClibc++ -lpthread $(LIBGCC_S)" define Package/gnuplot SECTION:=utils diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile index 1711b9178..a69ab9334 100644 --- a/utils/smartmontools/Makefile +++ b/utils/smartmontools/Makefile @@ -56,7 +56,7 @@ CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \ LDFLAGS="$$$$LDFLAGS" \ - LIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S) -lc" \ + LIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S) -lc" \ define Build/Configure (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \