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

Globally replace $(HOST_DIR)/usr/include with $(HOST_DIR)/include

Browse Source 
Since things are no longer installed in $(HOST_DIR)/usr, the callers
should also not refer to it.

This is a mechanical change with
git grep -l '$(HOST_DIR)/usr/include' | xargs sed -i 's%$(HOST_DIR)/usr/include%$(HOST_DIR)/include%g'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Arnout Vandecappelle 2017-07-05 13:14:22 +02:00 committed by Thomas Petazzoni
parent 19ba17ee3b
commit 24e50620c9
17 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/Makefile.in
View File

@ -216,7 +216,7 @@ UNZIP := $(shell which unzip || type -p unzip) -q
APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s)
HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include
HOST_CPPFLAGS = -I$(HOST_DIR)/include
HOST_CFLAGS ?= -O2
HOST_CFLAGS += $(HOST_CPPFLAGS)
HOST_CXXFLAGS += $(HOST_CFLAGS)

2
package/cmake/cmake.mk
View File

@ -32,7 +32,7 @@ CMAKE_CONF_OPTS = \
-DBUILD_CursesDialog=OFF
# Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a
# header available in $(HOST_DIR)/usr/include is used instead of a
# header available in $(HOST_DIR)/include is used instead of a
# CMake internal header, e.g. lzma* headers of the xz package
HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%")
HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%")

2
package/execline/execline.mk
View File

@ -48,7 +48,7 @@ HOST_EXECLINE_CONF_OPTS = \
--prefix=$(HOST_DIR) \
--shebangdir=/usr/bin \
--with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \
--with-include=$(HOST_DIR)/include \
--with-dynlib=$(HOST_DIR)/lib \
--disable-static \
--enable-shared \

2
package/google-breakpad/google-breakpad.mk
View File

@ -20,7 +20,7 @@ HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support
# Avoid using depot-tools to download this file.
define HOST_GOOGLE_BREAKPAD_LSS
$(INSTALL) -D -m 0644 \
$(HOST_DIR)/usr/include/linux_syscall_support.h \
$(HOST_DIR)/include/linux_syscall_support.h \
$(@D)/src/third_party/lss/linux_syscall_support.h
endef
HOST_GOOGLE_BREAKPAD_PRE_CONFIGURE_HOOKS += HOST_GOOGLE_BREAKPAD_LSS

4
package/gutenprint/gutenprint.mk
View File

@ -43,7 +43,7 @@ GUTENPRINT_CONF_OPTS = \
--disable-cups-ppds
# USE_PREGEN_XMLI18N_TMP_H is added by our patch
GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/usr/include/xmli18n-tmp.h
GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/include/xmli18n-tmp.h
HOST_GUTENPRINT_DEPENDENCIES = host-pkgconf
# The host-gutenprint shall create the required header
@ -78,7 +78,7 @@ GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include
cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/include
endef
HOST_GUTENPRINT_POST_BUILD_HOOKS += HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER

2
package/leafnode2/leafnode2.mk
View File

@ -30,7 +30,7 @@ define LEAFNODE2_BUILD_SORTNL_TOOL
cd $(@D); \
$(HOSTCC) $(HOST_CFLAGS) -o b_sortnl_host \
arc4random.c mergesort.c b_sortnl.c critmem_malloc.c \
critmem_realloc.c -DHAVE_CONFIG_H -I$(HOST_DIR)/usr/include \
critmem_realloc.c -DHAVE_CONFIG_H -I$(HOST_DIR)/include \
-L $(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib -lpcre
endef

4
package/libselinux/libselinux.mk
View File

@ -77,11 +77,11 @@ HOST_LIBSELINUX_DEPENDENCIES = \
ifeq ($(BR2_PACKAGE_PYTHON3),y)
HOST_LIBSELINUX_DEPENDENCIES += host-python3
HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/
HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)m/
HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
else
HOST_LIBSELINUX_DEPENDENCIES += host-python
HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/
HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/include/python$(PYTHON_VERSION_MAJOR)/
HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
endif

4
package/libsemanage/libsemanage.mk
View File

@ -35,13 +35,13 @@ HOST_LIBSEMANAGE_MAKE_OPTS += $(HOST_CONFIGURE_OPTS) \
ifeq ($(BR2_PACKAGE_PYTHON3),y)
HOST_LIBSEMANAGE_DEPENDENCIES += host-python3
HOST_LIBSEMANAGE_MAKE_OPTS += \
PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/" \
PYINC="-I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)m/" \
PYTHONLIBDIR="-L$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/" \
PYLIBVER="python$(PYTHON3_VERSION_MAJOR)"
else
HOST_LIBSEMANAGE_DEPENDENCIES += host-python
HOST_LIBSEMANAGE_MAKE_OPTS += \
PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \
PYINC="-I$(HOST_DIR)/include/python$(PYTHON_VERSION_MAJOR)/" \
PYTHONLIBDIR="-L$(HOST_DIR)/lib/python$(PYTHON_VERSION_MAJOR)/" \
PYLIBVER="python$(PYTHON_VERSION_MAJOR)"
endif

2
package/libxml-parser-perl/libxml-parser-perl.mk
View File

@ -16,7 +16,7 @@ define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
$(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
PREFIX=$(HOST_DIR) \
EXPATLIBPATH=$(HOST_DIR)/lib \
EXPATINCPATH=$(HOST_DIR)/usr/include \
EXPATINCPATH=$(HOST_DIR)/include \
INSTALLDIRS=site \
INSTALLSITELIB=$(HOST_DIR)/lib/perl \
INSTALLSITEARCH=$(HOST_DIR)/lib/perl \

2
package/linux-syscall-support/linux-syscall-support.mk
View File

@ -22,7 +22,7 @@ endef
define HOST_LINUX_SYSCALL_SUPPORT_INSTALL_CMDS
$(INSTALL) -D -m 0644 $(@D)/linux_syscall_support.h \
$(HOST_DIR)/usr/include/linux_syscall_support.h
$(HOST_DIR)/include/linux_syscall_support.h
endef
$(eval $(host-generic-package))

2
package/mfgtools/mfgtools.mk
View File

@ -14,7 +14,7 @@ HOST_MFGTOOLS_DEPENDENCIES = host-libusb
HOST_MFGTOOLS_CFLAGS = \
$(HOST_CFLAGS) $(HOST_LDFLAGS) -std=c++11 -lpthread \
-L$(@D)/MfgToolLib -lMfgToolLib -I$(@D)/MfgToolLib \
-lusb-1.0 -I$(HOST_DIR)/usr/include/libusb-1.0 \
-lusb-1.0 -I$(HOST_DIR)/include/libusb-1.0 \
-fpermissive -Wno-write-strings
define HOST_MFGTOOLS_CLI_BUILD

4
package/openocd/openocd.mk
View File

@ -88,8 +88,8 @@ HOST_OPENOCD_CONF_OPTS = \
--enable-openjtag \
--enable-buspirate \
--enable-sysfsgpio \
--oldincludedir=$(HOST_DIR)/usr/include \
--includedir=$(HOST_DIR)/usr/include \
--oldincludedir=$(HOST_DIR)/include \
--includedir=$(HOST_DIR)/include \
--disable-doxygen-html \
--with-jim-shared=no \
--disable-shared \

2
package/s6-rc/s6-rc.mk
View File

@ -50,7 +50,7 @@ HOST_S6_RC_CONF_OPTS = \
--prefix=$(HOST_DIR) \
--libexecdir=/usr/libexec \
--with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \
--with-include=$(HOST_DIR)/include \
--with-dynlib=$(HOST_DIR)/lib \
--disable-static \
--enable-shared \

2
package/s6/s6.mk
View File

@ -48,7 +48,7 @@ HOST_S6_DEPENDENCIES = host-execline
HOST_S6_CONF_OPTS = \
--prefix=$(HOST_DIR) \
--with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \
--with-include=$(HOST_DIR)/include \
--with-dynlib=$(HOST_DIR)/lib \
--disable-static \
--enable-shared \

2
package/setools/setools.mk
View File

@ -49,7 +49,7 @@ HOST_SETOOLS_CONF_ENV += am_cv_python_version=$(PYTHON_VERSION)
endif
HOST_SETOOLS_PYTHON_SITE_PACKAGES = $(HOST_DIR)/lib/python$(HOST_SETOOLS_PYTHON_VERSION)/site-packages
HOST_SETOOLS_PYTHON_INCLUDES = $(HOST_DIR)/usr/include/python$(HOST_SETOOLS_PYTHON_VERSION)
HOST_SETOOLS_PYTHON_INCLUDES = $(HOST_DIR)/include/python$(HOST_SETOOLS_PYTHON_VERSION)
HOST_SETOOLS_PYTHON_LIB = -lpython$(HOST_SETOOLS_PYTHON_VERSION)
# Notes: Need "disable-selinux-check" so the configure does not check to see

2
package/x11r7/xlib_libX11/xlib_libX11.mk
View File

@ -48,7 +48,7 @@ HOST_XLIB_LIBX11_CONF_OPTS = \
# src/util/makekeys is executed at build time to generate ks_tables.h, so
# it should get compiled for the host. The libX11 makefile unfortunately
# doesn't have X11_CFLAGS_FOR_BUILD so this doesn't work. For buildroot,
# we know the X11 includes are in $(HOST_DIR)/usr/include, which are already
# we know the X11 includes are in $(HOST_DIR)/include, which are already
# in the CFLAGS_FOR_BUILD, so we can just remove the X11_CFLAGS
define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
$(SED) '/X11_CFLAGS/d' $(@D)/src/util/Makefile*

2
package/zic/zic.mk
View File

@ -16,7 +16,7 @@ endef
define HOST_ZIC_INSTALL_CMDS
$(INSTALL) -D -m 755 $(@D)/zic $(HOST_DIR)/sbin/zic
$(INSTALL) -D -m 644 $(@D)/tzfile.h $(HOST_DIR)/usr/include/tzfile.h
$(INSTALL) -D -m 644 $(@D)/tzfile.h $(HOST_DIR)/include/tzfile.h
endef
$(eval $(host-generic-package))