[packages] replace occurences of -lgcc with $(LIBGCC_S)

SVN-Revision: 22122

diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile
index 692eb64855b3e7713f7ceef1abf5fc44ca0bfc15..114d28fe3a1a0108e2e58a7761bb581fcf034b19 100644 (file)
--- a/ipv6/mrd6/Makefile
+++ b/ipv6/mrd6/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -41,7 +41,7 @@ define Build/Compile
                SPACE_OPTIMIZE=yes \
                FULL_STATIC=no \
                CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DNO_INET6_OPTION -fno-builtin -fno-rtti" \
-               LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -ldl -lgcc -lm" \
+               LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -ldl -lm $(LIBGCC_S) -lc" \
                MODULE_CXX="\$$$$(CC) -shared \$$$$(CXXFLAGS) \$$$$(LDFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                PREFIX="/usr" \

diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile
index 5c4d3f691d98b372807b811d081333e82c817a46..9e808a9ea7a82fa03df5f20feb3bd7a025827db4 100644 (file)
--- a/net/gpsd/Makefile
+++ b/net/gpsd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006,2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -47,7 +47,7 @@ CONFIGURE_VARS += \
        CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
        CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
        LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib" \
-       LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
+       LIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S)" \
        CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
 
 define Build/InstallDev

diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index b762a9b1d158c4927422ab87cf9f98b68fadeb05..866ab8549d83f03db8e553804cec8ba335fb9844 100644 (file)
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -85,8 +85,8 @@ CONFIGURE_VARS += \
        CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
        CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
        LDFLAGS="$$$$LDFLAGS" \
-       LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
-       CLIENTCLIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
+       LIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S)" \
+       CLIENTCLIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S)" \
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index ea4f95dcb98c8930cccd4adc00b92e7c3167ed08..2d4444106836c1ea2b7c94b66a059ad20782104b 100644 (file)
--- 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 -luClibc++ -lcurses -lgcc $(LIBGCC_S) -ldl" \
+        LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses $(LIBGCC_S) -ldl" \
 
 MAKE_VARS += \
        LD="\$$$$(CC)" \

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index 33f653d5d93f5fbf88cf4024e93cf9893aee4afd..c7b4c62b14eaf3ef57e6b2f16d38100a6d2bcc2f 100644 (file)
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -41,7 +41,7 @@ endef
 
 CONFIGURE_VARS+= \
        CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti -I$(STAGING_DIR)/usr/include/libnetfilter_queue/" \
-       LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lgcc" \
+       LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm $(LIBGCC_S)" \
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \

diff --git a/net/znc/Makefile b/net/znc/Makefile
index 20230ad4fa06dc6c49ebb2de0ba70646fbbe5816..0ef689fb1f7a7cf5c9d36dafcc36afc00febe05f 100644 (file)
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -37,7 +37,7 @@ CONFIGURE_VARS += \
        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"
-       LIBS="-luClibc++ -lc -lm -lgcc -lssl"
+       LIBS="-luClibc++ -lm -lssl $(LIBGCC_S) -lc"
 
 CONFIGURE_ARGS += \
        $(TARGET_CONFIGURE_OPTS) \

diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile
index 07b41525b5206bb017f4279537ba4e095ee8eb1b..69494bebb17d1e67eb8b10db0a8f2141c7249fc6 100644 (file)
--- a/utils/smartmontools/Makefile
+++ b/utils/smartmontools/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -41,7 +41,7 @@ define Build/Configure
                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 -lgcc" \
+               LIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S) -lc" \
        )
 endef