bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] tor[-alpha] add fix to compile with SSP support

Browse Source 
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 <tripolar@gmx.at>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@38694 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
tripolar 2013-11-08 19:34:44 +00:00
parent 96d659bf35
commit bd72d12949
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/tor-alpha/Makefile
View File

@ -86,15 +86,17 @@ CONFIGURE_ARGS += \
ifneq ($(CONFIG_SSP_SUPPORT),y) ifneq ($(CONFIG_SSP_SUPPORT),y)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-gcc-hardening --disable-gcc-hardening
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS)"
else
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS) -fPIC"
endif endif
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CROSS_COMPILE="yes" CROSS_COMPILE="yes"
# pass CFLAGS again to override -O2 set by configure
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS)"
define Package/tor-alpha/install define Package/tor-alpha/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/

9
net/tor/Makefile
View File

@ -84,15 +84,16 @@ CONFIGURE_ARGS += \
ifneq ($(CONFIG_SSP_SUPPORT),y) ifneq ($(CONFIG_SSP_SUPPORT),y)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-gcc-hardening --disable-gcc-hardening
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS)"
else
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS) -fPIC"
endif endif
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CROSS_COMPILE="yes" CROSS_COMPILE="yes"
# pass CFLAGS again to override -O2 set by configure
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS)"
define Package/tor/install define Package/tor/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/