NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package: clean up remaining references to $(HOST_DIR)/usr

Browse Source 
Signed-off-by: Ferdinand van Aartsen <ferdinand@ombud.nl>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Ferdinand van Aartsen 2018-09-24 00:04:59 +02:00 committed by Thomas Petazzoni
parent 3918f83942
commit af0cd44a15
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/asterisk/asterisk.mk
View File

@ -292,7 +292,7 @@ HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/bin/xml2-config
HOST_ASTERISK_CONF_OPTS = \
--without-newt \
--without-curses \
--with-ncurses=$(HOST_DIR)/usr
--with-ncurses=$(HOST_DIR)
# Not an automake package, so does not inherit LDFLAGS et al. from
# the configure run.

6
package/clang/clang.mk
View File

@ -51,8 +51,8 @@ CLANG_CONF_OPTS += \
HOST_CLANG_CONF_OPTS += -DLLVM_CONFIG:FILEPATH=$(HOST_DIR)/bin/llvm-config
CLANG_CONF_OPTS += -DLLVM_CONFIG:FILEPATH=$(STAGING_DIR)/usr/bin/llvm-config \
-DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/usr/bin/clang-tblgen \
-DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/usr/bin/llvm-tblgen
-DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \
-DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen
# Clang can't be used as compiler on the target since there are no
# development files (headers) and other build tools. So remove clang
@ -81,7 +81,7 @@ CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_CLEANUP_TARGET
# for cross-compiling clang
define HOST_CLANG_INSTALL_CLANG_TBLGEN
$(INSTALL) -D -m 0755 $(HOST_CLANG_BUILDDIR)/bin/clang-tblgen \
$(HOST_DIR)/usr/bin/clang-tblgen
$(HOST_DIR)/bin/clang-tblgen
endef
HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN

2
package/libhttpparser/libhttpparser.mk
View File

@ -28,7 +28,7 @@ define HOST_LIBHTTPPARSER_BUILD_CMDS
endef
define HOST_LIBHTTPPARSER_INSTALL_CMDS
$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) PREFIX=$(HOST_DIR)/usr install
$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) PREFIX=$(HOST_DIR) install
endef
$(eval $(generic-package))

2
package/libssh2/libssh2.mk
View File

@ -42,7 +42,7 @@ endif
HOST_LIBSSH2_DEPENDENCIES += host-openssl
HOST_LIBSSH2_CONF_OPTS += --with-openssl \
--with-libssl-prefix=$(HOST_DIR)/usr \
--with-libssl-prefix=$(HOST_DIR) \
--without-libgcrypt
$(eval $(autotools-package))

2
package/prosody/prosody.mk
View File

@ -14,7 +14,7 @@ PROSODY_CFLAGS = $(TARGET_CFLAGS) -fPIC -std=c99 \
$(if BR2_TOOLCHAIN_USES_MUSL,-DWITHOUT_MALLINFO)
PROSODY_CONF_OPTS = \
--with-lua-bin=$(HOST_DIR)/usr/bin \
--with-lua-bin=$(HOST_DIR)/bin \
--with-lua=$(STAGING_DIR)/usr \
--lua-version=$(LUAINTERPRETER_ABIVER) \
--c-compiler=$(TARGET_CC) \

4
package/xmlstarlet/xmlstarlet.mk
View File

@ -27,8 +27,8 @@ endif
HOST_XMLSTARLET_DEPENDENCIES += host-libxml2 host-libxslt
HOST_XMLSTARLET_CONF_OPTS += \
--with-libxml-prefix=$(HOST_DIR)/usr \
--with-libxslt-prefix=$(HOST_DIR)/usr
--with-libxml-prefix=$(HOST_DIR) \
--with-libxslt-prefix=$(HOST_DIR)
$(eval $(autotools-package))
$(eval $(host-autotools-package))