use $(FPIC) in a few places where it matters

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12225 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 846b997..59a826b 100644 (file)
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -30,6 +30,7 @@ define Package/libgmp/description
        signed integers, rational numbers, and floating point numbers.
 endef
 
        signed integers, rational numbers, and floating point numbers.
 endef
 

+TARGET_CFLAGS += $(FPIC)

 CONFIGURE_VARS += CC="$(TARGET_CROSS)gcc"
 CONFIGURE_ARGS += \
        --enable-shared \
 CONFIGURE_VARS += CC="$(TARGET_CROSS)gcc"
 CONFIGURE_ARGS += \
        --enable-shared \

diff --git a/package/ipkg/Makefile b/package/ipkg/Makefile
index 2090691..d6e2271 100644 (file)
--- a/package/ipkg/Makefile
+++ b/package/ipkg/Makefile
@@ -38,6 +38,7 @@ define Package/ipkg/description
  ipkg knows how to install both .ipk and .deb packages.
 endef
 
  ipkg knows how to install both .ipk and .deb packages.
 endef
 

+TARGET_CFLAGS += $(FPIC)

 CONFIGURE_ARGS += $(DISABLE_LARGEFILE)
 
 define Build/Compile
 CONFIGURE_ARGS += $(DISABLE_LARGEFILE)
 
 define Build/Compile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 5b43dfe..b6be986 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -217,6 +217,8 @@ define Build/Configure
                clean
 endef
 
                clean
 endef
 

+TARGET_CFLAGS += $(FPIC)
+

 define Build/Compile
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
 define Build/Compile
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \

diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index 88776a0..c763526 100644 (file)
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -29,7 +29,7 @@ define Package/libnl/description
  This package contains a library for applications dealing with netlink sockets
 endef
 
  This package contains a library for applications dealing with netlink sockets
 endef
 

-TARGET_CFLAGS += -ffunction-sections
+TARGET_CFLAGS += -ffunction-sections $(FPIC)

 
 define Build/Compile
        $(call Build/Compile/Default)
 
 define Build/Compile
        $(call Build/Compile/Default)

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index ed048a4..cf0304b 100644 (file)
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -30,6 +30,8 @@ define Package/libpcap/description
  packet capture.
 endef
 
  packet capture.
 endef
 

+TARGET_CFLAGS += $(FPIC)
+

 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \

diff --git a/package/lua/Makefile b/package/lua/Makefile
index d29b323..1894358 100644 (file)
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -24,14 +24,6 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-ifeq ($(ARCH),powerpc)
-  FPIC:=-fPIC
-endif
-ifeq ($(ARCH),x86_64)
-  FPIC:=-fPIC
-endif
-
-

 define Package/lua/Default
   SUBMENU:=LUA
   SECTION:=lang
 define Package/lua/Default
   SUBMENU:=LUA
   SECTION:=lang


@@ -95,7 +87,7 @@ endef
 define Build/Configure
 endef
 
 define Build/Configure
 endef
 

-TARGET_CFLAGS += -DLUA_USE_LINUX
+TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC)

 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -104,7 +96,7 @@ define Build/Compile
                AR="$(TARGET_CROSS)ar rcu" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                INSTALL_ROOT=/usr \
                AR="$(TARGET_CROSS)ar rcu" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                INSTALL_ROOT=/usr \

-               CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(FPIC)" \
+               CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \

                MYLDFLAGS="$(TARGET_LDFLAGS)" \
                PKG_VERSION=$(PKG_VERSION) \
                all linux 
                MYLDFLAGS="$(TARGET_LDFLAGS)" \
                PKG_VERSION=$(PKG_VERSION) \
                all linux 

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 51a5a0a..a27334b 100644 (file)
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -28,6 +28,8 @@ endef
 define Build/Configure
 endef
 
 define Build/Configure
 endef
 

+TARGET_CFLAGS += $(FPIC)
+

 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 7e31bcf..ec20de2 100644 (file)
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -29,6 +29,8 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)
 endef
 
        $(CP) ./src/* $(PKG_BUILD_DIR)
 endef
 

+TARGET_CFLAGS += $(FPIC)
+

 define Build/InstallDev
        mkdir -p $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libnvram*.so $(1)/usr/lib/
 define Build/InstallDev
        mkdir -p $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libnvram*.so $(1)/usr/lib/

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 2937368..f19551d 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -89,6 +89,8 @@ define Build/Configure
        )
 endef
 
        )
 endef
 

+TARGET_CFLAGS += $(FPIC)
+

 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 6a275ca..76729db 100644 (file)
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -36,6 +36,7 @@ define Package/opkg/description
   opkg knows how to install both .ipk and .deb packages.
 endef
 
   opkg knows how to install both .ipk and .deb packages.
 endef
 

+TARGET_CFLAGS += $(FPIC)

 EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib
 EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
 EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib
 EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 

diff --git a/package/uci/Makefile b/package/uci/Makefile
index d5e0ecf..c24ce04 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -47,6 +47,7 @@ endef
 define Build/Configure
 endef
 
 define Build/Configure
 endef
 

+TARGET_CFLAGS += $(FPIC)

 UCI_MAKEOPTS = \
                $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \
 UCI_MAKEOPTS = \
                $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 9cf9219..9c8058b 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -29,7 +29,7 @@ define Build/Configure
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \

-               CFLAGS="$(TARGET_CFLAGS) -fPIC $(CFLAGS_LARGEFILE)" \
+               CFLAGS="$(TARGET_CFLAGS) $(FPIC) $(CFLAGS_LARGEFILE)" \

                UNAME_S="Linux" \
                ./configure \
                        --prefix=/usr \
                UNAME_S="Linux" \
                ./configure \
                        --prefix=/usr \