From 3e679367f0253cdf3548fdc2ad68eeb115649735 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 11 Jul 2010 00:37:05 +0000 Subject: [PATCH] [packages] replace occurences of -lgcc with $(LIBGCC_S) git-svn-id: svn://svn.openwrt.org/openwrt/packages@22122 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ipv6/mrd6/Makefile | 4 ++-- net/gpsd/Makefile | 4 ++-- net/kismet/Makefile | 6 +++--- net/lftp/Makefile | 2 +- net/peerguardian/Makefile | 4 ++-- net/znc/Makefile | 4 ++-- utils/smartmontools/Makefile | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile index 692eb6485..114d28fe3 100644 --- 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 5c4d3f691..9e808a9ea 100644 --- 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 b762a9b1d..866ab8549 100644 --- 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 ea4f95dcb..2d4444106 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 -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 33f653d5d..c7b4c62b1 100644 --- 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 20230ad4f..0ef689fb1 100644 --- 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 07b41525b..69494bebb 100644 --- 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 -- 2.11.0