From: tripolar Date: Fri, 8 Nov 2013 19:34:44 +0000 (+0000) Subject: [packages] tor[-alpha] add fix to compile with SSP support X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=bd72d12949f393380f9b604015693b9a621b24d7;p=packages.git [packages] tor[-alpha] add fix to compile with SSP support without this fix the compile ends with: tor-resolve.o: relocation R_MIPS_26 against `puts' can not be used when making a shared objec$ tor-resolve.o: could not read symbols: Bad value collect2: ld returned 1 exit status make[8]: *** [tor-resolve] Error 1 Signed-off-by: Peter Wagner git-svn-id: svn://svn.openwrt.org/openwrt/packages@38694 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/net/tor-alpha/Makefile b/net/tor-alpha/Makefile index 6e6e69893..8824ab10b 100644 --- a/net/tor-alpha/Makefile +++ b/net/tor-alpha/Makefile @@ -86,15 +86,17 @@ CONFIGURE_ARGS += \ ifneq ($(CONFIG_SSP_SUPPORT),y) CONFIGURE_ARGS += \ --disable-gcc-hardening + MAKE_FLAGS += \ + CFLAGS="$(TARGET_CFLAGS)" +else + MAKE_FLAGS += \ + CFLAGS="$(TARGET_CFLAGS) -fPIC" + endif CONFIGURE_VARS += \ CROSS_COMPILE="yes" -# pass CFLAGS again to override -O2 set by configure -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" - define Package/tor-alpha/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/ diff --git a/net/tor/Makefile b/net/tor/Makefile index faa72da0d..7d246166f 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -84,15 +84,16 @@ CONFIGURE_ARGS += \ ifneq ($(CONFIG_SSP_SUPPORT),y) CONFIGURE_ARGS += \ --disable-gcc-hardening + MAKE_FLAGS += \ + CFLAGS="$(TARGET_CFLAGS)" +else + MAKE_FLAGS += \ + CFLAGS="$(TARGET_CFLAGS) -fPIC" endif CONFIGURE_VARS += \ CROSS_COMPILE="yes" -# pass CFLAGS again to override -O2 set by configure -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" - define Package/tor/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/