[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
This commit is contained in:
parent
5935f39396
commit
fc8c6d10f3
@ -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
|
||||
|
@ -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 (+=)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -38,7 +38,7 @@ BUILD_SHARED = 1
|
||||
BUILD_STATIC = 1
|
||||
#DEBUG = 1
|
||||
#PROFILE = 1
|
||||
STANDALONE = -nodefaultlibs
|
||||
STANDALONE = -nodefaultlibs
|
||||
|
||||
CFLAGS = \
|
||||
${CUSTOMINCDIR} ${OPTFLAGS} ${CWARNOPTS} ${STANDALONE}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 $$@
|
||||
|
||||
|
@ -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 += \
|
||||
|
@ -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,\
|
||||
|
@ -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
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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 += \
|
||||
|
@ -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); )
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 += \
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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} ; \
|
||||
|
Loading…
x
Reference in New Issue
Block a user