diff options
| author | wigyori <wigyori@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-14 19:45:31 +0000 |
|---|---|---|
| committer | wigyori <wigyori@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-14 19:45:31 +0000 |
| commit | dda6e8a8a3e33eafe8d131a21d54027b4288646d (patch) | |
| tree | 4f5dac38d54a0d7406c025382dad885125758d45 /tools | |
| parent | a91083e2281b038386c4e0e4ad1f42663230668a (diff) | |
[tools] elftosb: support static linking
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38400 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/elftosb/Makefile | 11 | ||||
| -rw-r--r-- | tools/elftosb/patches/003-use-ldflags.patch | 26 |
2 files changed, 29 insertions, 8 deletions
diff --git a/tools/elftosb/Makefile b/tools/elftosb/Makefile index c063217d0b..6f9b963975 100644 --- a/tools/elftosb/Makefile +++ b/tools/elftosb/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -13,19 +13,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://repository.timesys.com/buildsources/e/elftosb/elftosb-10.12.01/ PKG_MD5SUM:=e8005d606c1e0bb3507c82f6eceb3056 -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/host-build.mk define Host/Compile - $(MAKE) -C $(HOST_BUILD_DIR) -f makefile LDFLAGS="$(HOST_STATIC_LINKING)" + $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" endef define Host/Install $(INSTALL_BIN) $(HOST_BUILD_DIR)/bld/linux/elftosb $(STAGING_DIR_HOST)/bin/elftosb endef -define Host/Clean -endef - $(eval $(call HostBuild)) diff --git a/tools/elftosb/patches/003-use-ldflags.patch b/tools/elftosb/patches/003-use-ldflags.patch new file mode 100644 index 0000000000..82fd1e8d0a --- /dev/null +++ b/tools/elftosb/patches/003-use-ldflags.patch @@ -0,0 +1,26 @@ +--- a/makefile.rules ++++ b/makefile.rules +@@ -131,19 +131,20 @@ exec_always: + @echo "LIBS = ${LIBS}" + @echo "EXEC_FILE = ${EXEC_FILE}" + @echo "BUILD_DIR = ${BUILD_DIR}" ++ @echo "LDFLAGS = ${LDFLAGS}" + + clean: + rm -f ${OBJ_FILES_ELFTOSB2} ${OBJ_FILES_SBTOOL} ${OBJ_FILES_KEYGEN} \ + ${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN} + + elftosb: ${OBJ_FILES_ELFTOSB2} +- gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2} ++ gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_ELFTOSB2} + + sbtool: ${OBJ_FILES_SBTOOL} +- gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL} ++ gcc ${OBJ_FILES_SBTOOL} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_SBTOOL} + + keygen: ${OBJ_FILES_KEYGEN} +- gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN} ++ gcc ${OBJ_FILES_KEYGEN} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_KEYGEN} + + + #ifeq ("${UNAMES}", "Linux") |