diff options
Diffstat (limited to 'rules')
98 files changed, 280 insertions, 269 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index a82879e19..65313d74f 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -148,7 +148,7 @@ $(STATEDIR)/barebox.install: @$(foreach prog, $(BAREBOX_PROGS_HOST), \ if [ -e $(BAREBOX_BUILD_DIR)/scripts/$(prog) ]; then \ install -v -D -m755 $(BAREBOX_BUILD_DIR)/scripts/$(prog) \ - $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog)) || exit; \ + $(PTXDIST_SYSROOT_HOST)/usr/bin/$(notdir $(prog)) || exit; \ fi;) @$(foreach prog, $(BAREBOX_PROGS_TARGET_y), \ @@ -204,7 +204,7 @@ $(STATEDIR)/barebox.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX) @$(foreach prog, $(BAREBOX_PROGS_HOST), \ - rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) + rm -vf $(PTXDIST_SYSROOT_HOST)/usr/bin/$(notdir $(prog))$(ptx/nl)) # ---------------------------------------------------------------------------- # oldconfig / menuconfig diff --git a/rules/bluez-qt.make b/rules/bluez-qt.make index af65c2dbc..301430a4b 100644 --- a/rules/bluez-qt.make +++ b/rules/bluez-qt.make @@ -34,7 +34,7 @@ BLUEZ_QT_CONF_OPT := \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs \ - -DECM_DIR=$(PTXDIST_SYSROOT_HOST)/share/ECM/cmake/ + -DECM_DIR=$(PTXDIST_SYSROOT_HOST)/usr/share/ECM/cmake/ # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/boost.make b/rules/boost.make index 8d5a9f78e..8be9925d7 100644 --- a/rules/boost.make +++ b/rules/boost.make @@ -128,7 +128,7 @@ ifdef PTXCONF_BOOST_MPI endif ifdef PTXCONF_BOOST_PYTHON3 - @echo "using python : $(PYTHON3_MAJORMINOR) : $(PTXDIST_SYSROOT_CROSS)/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR) : $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam + @echo "using python : $(PYTHON3_MAJORMINOR) : $(PTXDIST_SYSROOT_CROSS)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR) : $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam endif @echo "all:" > $(BOOST_DIR)/Makefile diff --git a/rules/canfestival.make b/rules/canfestival.make index 22ec951fe..91d1d973a 100644 --- a/rules/canfestival.make +++ b/rules/canfestival.make @@ -61,7 +61,7 @@ $(STATEDIR)/canfestival.install.post: @$(call targetinfo) @$(call world/install.post, CANFESTIVAL) @for file in objdictedit objdictgen; do \ - ln -sf $(PTXDIST_SYSROOT_TARGET)/usr/bin/"$${file}" $(PTXDIST_SYSROOT_HOST)/bin; \ + ln -sf $(PTXDIST_SYSROOT_TARGET)/usr/bin/"$${file}" $(PTXDIST_SYSROOT_HOST)/usr/bin; \ done @$(call touch) diff --git a/rules/ckermit.make b/rules/ckermit.make index 5a6373938..ecf1df5a7 100644 --- a/rules/ckermit.make +++ b/rules/ckermit.make @@ -41,7 +41,7 @@ CKERMIT_MAKE_OPT := \ prefix=/usr \ CC=$(CROSS_CC) \ CC2=$(CROSS_CC) \ - WART=$(PTXDIST_SYSROOT_HOST)/bin/wart \ + WART=$(PTXDIST_SYSROOT_HOST)/usr/bin/wart \ CFLAGS='$(CROSS_CPPFLAGS) $(CROSS_CFLAGS) -O2 -g -DLINUX -DFNFLOAT -DCK_POSIX_SIG -DCK_NEWTERM -DTCPSOCKET -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR -DCK_NCURSES -DHAVE_PTMX' \ LNKFLAGS='$(CROSS_LDFLAGS)' \ LIBS='-lncurses -lutil -lresolv -lcrypt -lm' diff --git a/rules/cross-dummy-strip.make b/rules/cross-dummy-strip.make index 39a2c7656..b337d9d4a 100644 --- a/rules/cross-dummy-strip.make +++ b/rules/cross-dummy-strip.make @@ -15,7 +15,7 @@ CROSS_DUMMY_STRIP_LICENSE := ignore $(STATEDIR)/cross-dummy-strip.install: @$(call targetinfo) - install -D -m 755 $(PTXDIST_TOPDIR)/scripts/dummy-strip.sh $(PTXDIST_SYSROOT_CROSS)/bin/strip + install -D -m 755 $(PTXDIST_TOPDIR)/scripts/dummy-strip.sh $(PTXDIST_SYSROOT_CROSS)/usr/bin/strip @$(call touch) # vim: syntax=make diff --git a/rules/cross-pkg-config-wrapper.make b/rules/cross-pkg-config-wrapper.make index 71637803e..e5b17265d 100644 --- a/rules/cross-pkg-config-wrapper.make +++ b/rules/cross-pkg-config-wrapper.make @@ -23,9 +23,9 @@ CROSS_PKG_CONFIG_WRAPPER_SCRIPT = \ $(STATEDIR)/cross-pkg-config-wrapper.install: @$(call targetinfo) @ln -svf $(CROSS_PKG_CONFIG_WRAPPER_SCRIPT) \ - $(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config + $(PTXDIST_SYSROOT_CROSS)/usr/bin/$(COMPILER_PREFIX)pkg-config @ln -svf $(CROSS_PKG_CONFIG_WRAPPER_SCRIPT) \ - $(PTXDIST_SYSROOT_CROSS)/bin/pkg-config + $(PTXDIST_SYSROOT_CROSS)/usr/bin/pkg-config @$(call touch) # vim: syntax=make diff --git a/rules/cups-filters.make b/rules/cups-filters.make index 42b550a7b..3a4abe809 100644 --- a/rules/cups-filters.make +++ b/rules/cups-filters.make @@ -51,7 +51,7 @@ CUPS_FILTERS_CONF_OPT := \ --disable-werror \ --disable-braille \ --with-gnu-ld \ - --with-cups-config=$(PTXDIST_SYSROOT_CROSS)/bin/cups-config \ + --with-cups-config=$(PTXDIST_SYSROOT_CROSS)/usr/bin/cups-config \ --with-apple-raster-filter=rastertopdf \ --with-cups-rundir=/run \ --with-cups-domainsocket=/run/cups.sock \ diff --git a/rules/dbus-glib.make b/rules/dbus-glib.make index bf92486b7..841019502 100644 --- a/rules/dbus-glib.make +++ b/rules/dbus-glib.make @@ -41,8 +41,8 @@ DBUS_GLIB_CONF_OPT := \ --disable-asserts \ --enable-checks \ --disable-gtk-doc \ - --with-dbus-binding-tool=$(PTXDIST_SYSROOT_HOST)/bin/dbus-binding-tool \ - --with-introspect-xml=$(PTXDIST_SYSROOT_HOST)/share/dbus-glib/dbus-bus-introspect.xml + --with-dbus-binding-tool=$(PTXDIST_SYSROOT_HOST)/usr/bin/dbus-binding-tool \ + --with-introspect-xml=$(PTXDIST_SYSROOT_HOST)/usr/share/dbus-glib/dbus-bus-introspect.xml # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/eggdbus.make b/rules/eggdbus.make index 724735b86..09bc6ff19 100644 --- a/rules/eggdbus.make +++ b/rules/eggdbus.make @@ -36,7 +36,7 @@ EGGDBUS_CONF_OPT := \ --disable-verbose-mode \ --disable-man-pages \ --disable-gtk-doc \ - --with-eggdbus-tools=$(PTXDIST_SYSROOT_HOST)/bin + --with-eggdbus-tools=$(PTXDIST_SYSROOT_HOST)/usr/bin # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/file.make b/rules/file.make index dafbd14ac..337b30bb4 100644 --- a/rules/file.make +++ b/rules/file.make @@ -30,7 +30,7 @@ FILE_LICENSE_FILES := \ # Prepare # ---------------------------------------------------------------------------- -FILE_PATH := PATH=$(PTXDIST_SYSROOT_HOST)/bin/file:$(CROSS_PATH) +FILE_PATH := PATH=$(PTXDIST_SYSROOT_HOST)/usr/bin/file:$(CROSS_PATH) FILE_CONF_TOOL := autoconf FILE_CONF_OPT := \ diff --git a/rules/glib.make b/rules/glib.make index e6bd151f9..9226cc7fa 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -63,7 +63,7 @@ GLIB_CONF_OPT := \ $(STATEDIR)/glib.install.post: @$(call targetinfo) - @sed -i 's;^bindir=.*;bindir=$(PTXDIST_SYSROOT_HOST)/bin;' \ + @sed -i 's;^bindir=.*;bindir=$(PTXDIST_SYSROOT_HOST)/usr/bin;' \ $(GLIB_PKGDIR)/usr/$(CROSS_LIB_DIR)/pkgconfig/gio-2.0.pc @sed -i "s;'/usr;'$(SYSROOT)/usr;" \ $(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/$(CROSS_LIB_DIR)/libglib-2.0.so*-gdb.py \ diff --git a/rules/gnupg.make b/rules/gnupg.make index a2c33212c..c5ec8e844 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -38,7 +38,7 @@ GNUPG_LICENSE_FILES := \ GNUPG_CONF_ENV := \ $(CROSS_ENV) \ - ac_cv_path_GPGRT_CONFIG=$(PTXDIST_SYSROOT_CROSS)/bin/gpgrt-config + ac_cv_path_GPGRT_CONFIG=$(PTXDIST_SYSROOT_CROSS)/usr/bin/gpgrt-config GNUPG_CONF_TOOL := autoconf GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ diff --git a/rules/gobject-introspection.make b/rules/gobject-introspection.make index 61b53edae..1d66c7b76 100644 --- a/rules/gobject-introspection.make +++ b/rules/gobject-introspection.make @@ -36,8 +36,8 @@ GOBJECT_INTROSPECTION_CONF_OPT := \ -Dbuild_introspection_data=true \ -Dcairo=disabled \ -Ddoctool=disabled \ - -Dgi_cross_binary_wrapper=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \ - -Dgi_cross_ldd_wrapper=$(PTXDIST_SYSROOT_CROSS)/bin/qemu/ldd \ + -Dgi_cross_binary_wrapper=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross \ + -Dgi_cross_ldd_wrapper=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd \ -Dgi_cross_use_prebuilt_gi=true \ -Dgtk_doc=false \ -Dpython=$(SYSTEMPYTHON3) @@ -45,31 +45,31 @@ GOBJECT_INTROSPECTION_CONF_OPT := \ $(STATEDIR)/gobject-introspection.prepare: @$(call targetinfo) - @echo '#!/bin/sh' > $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner - @echo 'export GI_SCANNER_DISABLE_CACHE=1' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner + @echo '#!/bin/sh' > $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-scanner + @echo 'export GI_SCANNER_DISABLE_CACHE=1' >> $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-scanner @echo 'export pkg_ldflags="$$(find -H $${pkg_dir} -name .libs -printf "-Wl,-rpath,%p ")$${pkg_ldflags}"' \ - >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner - @echo 'export CC=$(CROSS_CC)' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner - @echo 'exec "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ - --use-binary-wrapper="$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross" \ - --use-ldd-wrapper="$(PTXDIST_SYSROOT_CROSS)/bin/qemu/ldd" \ + >> $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-scanner + @echo 'export CC=$(CROSS_CC)' >> $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-scanner + @echo 'exec "$(PTXDIST_SYSROOT_HOST)/usr/bin/g-ir-scanner" \ + --use-binary-wrapper="$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross" \ + --use-ldd-wrapper="$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd" \ --add-include-path=${PTXDIST_SYSROOT_TARGET}/usr/share/gir-1.0 \ - "$${@}"' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner - @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner + "$${@}"' >> $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-scanner + @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-scanner - @echo '#!/bin/sh' > $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-compiler - @echo '$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \ + @echo '#!/bin/sh' > $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-compiler + @echo '$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross \ $(SYSROOT)/usr/bin/g-ir-compiler --includedir \ - $(SYSROOT)/usr/share/gir-1.0 "$${@}"' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-compiler - @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-compiler + $(SYSROOT)/usr/share/gir-1.0 "$${@}"' >> $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-compiler + @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-compiler - @sed -i 's;"/share";"$(PTXDIST_SYSROOT_HOST)/share";' \ - "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ - "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-annotation-tool" + @sed -i 's;"/usr/share";"$(PTXDIST_SYSROOT_HOST)/usr/share";' \ + "$(PTXDIST_SYSROOT_HOST)/usr/bin/g-ir-scanner" \ + "$(PTXDIST_SYSROOT_HOST)/usr/bin/g-ir-annotation-tool" - @sed -i "s;'/lib';'$(PTXDIST_SYSROOT_HOST)/lib';" \ - "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ - "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-annotation-tool" + @sed -i "s;'/usr/lib';'$(PTXDIST_SYSROOT_HOST)/usr/lib';" \ + "$(PTXDIST_SYSROOT_HOST)/usr/bin/g-ir-scanner" \ + "$(PTXDIST_SYSROOT_HOST)/usr/bin/g-ir-annotation-tool" @$(call world/prepare, GOBJECT_INTROSPECTION) @$(call touch) @@ -85,7 +85,7 @@ GOBJECT_INTROSPECTION_MAKE_ENV = \ $(STATEDIR)/gobject-introspection.install.post: @$(call targetinfo) @$(call world/install.post, GOBJECT_INTROSPECTION) - @sed -i 's;bindir=.*;bindir=$(PTXDIST_SYSROOT_CROSS)/bin;' \ + @sed -i 's;bindir=.*;bindir=$(PTXDIST_SYSROOT_CROSS)/usr/bin;' \ $(SYSROOT)/usr/lib/pkgconfig/gobject-introspection-1.0.pc @$(call touch) @@ -119,7 +119,7 @@ $(STATEDIR)/gobject-introspection.clean: @$(call targetinfo) @$(call clean_pkg, GOBJECT_INTROSPECTION) @rm \ - $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner \ - $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-compiler + $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-scanner \ + $(PTXDIST_SYSROOT_CROSS)/usr/bin/g-ir-compiler # vim: syntax=make diff --git a/rules/gpgme.make b/rules/gpgme.make index 1508fcd12..2e3cbb196 100644 --- a/rules/gpgme.make +++ b/rules/gpgme.make @@ -36,7 +36,7 @@ GPGME_LANG := $(subst $(space),$(comma),$(strip $(GPGME_LANG-y))) GPGME_CONF_ENV := \ $(CROSS_ENV) \ - LIBASSUAN_CONFIG="$(PTXDIST_SYSROOT_CROSS)/bin/libassuan-config" + LIBASSUAN_CONFIG="$(PTXDIST_SYSROOT_CROSS)/usr/bin/libassuan-config" # # autoconf diff --git a/rules/grpc.make b/rules/grpc.make index 85032aafb..5f82dabab 100644 --- a/rules/grpc.make +++ b/rules/grpc.make @@ -46,7 +46,7 @@ GRPC_CONF_OPT := \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ - -DPROTOBUF_PROTOC_EXECUTABLE=$(PTXDIST_SYSROOT_HOST)/bin/protoc + -DPROTOBUF_PROTOC_EXECUTABLE=$(PTXDIST_SYSROOT_HOST)/usr/bin/protoc # ---------------------------------------------------------------------------- # Install diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make index 507a47cb8..591e587d6 100644 --- a/rules/gst-plugins-good1.make +++ b/rules/gst-plugins-good1.make @@ -119,7 +119,7 @@ ifdef PTXCONF_KERNEL_HEADER GST_PLUGINS_GOOD1_CPPFLAGS := -isystem $(KERNEL_HEADERS_INCLUDE_DIR) endif ifdef PTXCONF_GST_PLUGINS_GOOD1_QT5 -GST_PLUGINS_GOOD1_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/bin/qt5:$(CROSS_PATH) +GST_PLUGINS_GOOD1_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qt5:$(CROSS_PATH) endif ifdef PTXCONF_ARCH_X86 diff --git a/rules/host-autotools-autoconf.make b/rules/host-autotools-autoconf.make index 994ca51fe..7bacc56f8 100644 --- a/rules/host-autotools-autoconf.make +++ b/rules/host-autotools-autoconf.make @@ -45,14 +45,14 @@ HOST_AUTOTOOLS_AUTOCONF_CONF_TOOL := autoconf $(STATEDIR)/host-autotools-autoconf.install.post: @$(call targetinfo) @sed -i \ - -e "s;'\(/share/autoconf\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ - -e "s;'\(/bin/auto[^']*\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ + -e "s;'\(/usr/share/autoconf\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ + -e "s;'\(/usr/bin/auto[^']*\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ -e "s;'/[^']*/sysroot-host\(/bin/m4\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ - $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/bin/* \ - $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/share/autoconf/autom4te.cfg + $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/usr/bin/* \ + $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/usr/share/autoconf/autom4te.cfg @sed -i \ - -e "s;\(/share/autoconf/\);$(PTXDIST_SYSROOT_HOST)\1;g" \ - $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/bin/autoconf + -e "s;\(/usr/share/autoconf/\);$(PTXDIST_SYSROOT_HOST)\1;g" \ + $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/usr/bin/autoconf @$(call world/install.post, HOST_AUTOTOOLS_AUTOCONF) @$(call touch) diff --git a/rules/host-autotools-automake.make b/rules/host-autotools-automake.make index 1ddc0c982..2361f8589 100644 --- a/rules/host-autotools-automake.make +++ b/rules/host-autotools-automake.make @@ -44,11 +44,11 @@ HOST_AUTOTOOLS_AUTOMAKE_MAKE_OPT := MANS= $(STATEDIR)/host-autotools-automake.install.post: @$(call targetinfo) @sed -i \ - -e "s;'\(/share/automake-[^']*\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ - -e "s;'\(/share/aclocal[^']*\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ - -e "s;'\(/bin/m4\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ - $(HOST_AUTOTOOLS_AUTOMAKE_PKGDIR)/bin/* \ - $(HOST_AUTOTOOLS_AUTOMAKE_PKGDIR)/share/automake-*/Automake/Config.pm + -e "s;'\(/usr/share/automake-[^']*\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ + -e "s;'\(/usr/share/aclocal[^']*\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ + -e "s;'\(/usr/bin/m4\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \ + $(HOST_AUTOTOOLS_AUTOMAKE_PKGDIR)/usr/bin/* \ + $(HOST_AUTOTOOLS_AUTOMAKE_PKGDIR)/usr/share/automake-*/Automake/Config.pm @$(call world/install.post, HOST_AUTOTOOLS_AUTOMAKE) @$(call touch) diff --git a/rules/host-bzip2.make b/rules/host-bzip2.make index bce3a5903..5c506cfea 100644 --- a/rules/host-bzip2.make +++ b/rules/host-bzip2.make @@ -15,6 +15,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_BZIP2) += host-bzip2 # Prepare # ---------------------------------------------------------------------------- -HOST_BZIP2_INSTALL_OPT := install PREFIX= +HOST_BZIP2_INSTALL_OPT := install PREFIX=/usr # vim: syntax=make diff --git a/rules/host-ckermit.make b/rules/host-ckermit.make index 26c3b891b..b9a03dc5c 100644 --- a/rules/host-ckermit.make +++ b/rules/host-ckermit.make @@ -30,7 +30,7 @@ HOST_CKERMIT_CONF_TOOL := NO HOST_CKERMIT_MAKE_OPT := \ linuxa \ - prefix= \ + prefix=/usr \ KFLAGS='-O2 -DCK_NCURSES -DHAVE_PTMX' \ LIBS='-lncurses -lutil -lresolv -lcrypt' @@ -39,14 +39,14 @@ HOST_CKERMIT_MAKE_OPT := \ # ---------------------------------------------------------------------------- HOST_CKERMIT_INSTALL_OPT := \ - prefix= \ + prefix=/usr \ install $(STATEDIR)/host-ckermit.install: @$(call targetinfo) @$(call world/install, HOST_CKERMIT) - @ln -sf kermit $(HOST_CKERMIT_PKGDIR)/bin/ckermit - @install -m755 $(HOST_CKERMIT_DIR)/wart $(HOST_CKERMIT_PKGDIR)/bin/ + @ln -sf kermit $(HOST_CKERMIT_PKGDIR)/usr/bin/ckermit + @install -m755 $(HOST_CKERMIT_DIR)/wart $(HOST_CKERMIT_PKGDIR)/usr/bin/ @$(call touch) # vim: syntax=make diff --git a/rules/host-cmake.make b/rules/host-cmake.make index 338009f3b..03b2d519f 100644 --- a/rules/host-cmake.make +++ b/rules/host-cmake.make @@ -50,7 +50,7 @@ HOST_CMAKE_CONF_ENV := \ HOST_CMAKE_BUILD_OOT := YES HOST_CMAKE_CONF_TOOL := autoconf HOST_CMAKE_CONF_OPT := \ - $(HOST_AUTOCONF) \ + --prefix=/usr \ -- \ -DBUILD_TESTING=NO \ -DCMAKE_USE_OPENSSL=NO diff --git a/rules/host-cups.make b/rules/host-cups.make index a2edf1a2e..9d970c81e 100644 --- a/rules/host-cups.make +++ b/rules/host-cups.make @@ -29,7 +29,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_CUPS) += host-cups HOST_CUPS_CONF_TOOL := autoconf HOST_CUPS_CONF_OPT := \ $(HOST_AUTOCONF) \ - --libdir=/lib/ \ + --libdir=/usr/lib/ \ --disable-mallinfo \ --disable-libpaper \ --disable-libusb \ @@ -86,7 +86,7 @@ $(STATEDIR)/host-cups.install: @$(call compile, HOST_CUPS, -C ${HOST_CUPS_DIR}/ppdc install) @$(call touch) -CROSS_PPDC := $(PTXDIST_SYSROOT_CROSS)/bin/ppdc +CROSS_PPDC := $(PTXDIST_SYSROOT_CROSS)/usr/bin/ppdc $(STATEDIR)/host-cups.install.post: @$(call targetinfo) @@ -94,7 +94,7 @@ $(STATEDIR)/host-cups.install.post: @( \ echo '#!/bin/sh'; \ - echo 'CUPS_DATADIR=$(PTXDIST_SYSROOT_HOST)/share/cups $(PTXDIST_SYSROOT_HOST)/bin/ppdc "$$@"'; \ + echo 'CUPS_DATADIR=$(PTXDIST_SYSROOT_HOST)/usr/share/cups $(PTXDIST_SYSROOT_HOST)/usr/bin/ppdc "$$@"'; \ ) > $(CROSS_PPDC) @chmod +x $(CROSS_PPDC) diff --git a/rules/host-dbus-glib.make b/rules/host-dbus-glib.make index 75bd9c645..fa343dec6 100644 --- a/rules/host-dbus-glib.make +++ b/rules/host-dbus-glib.make @@ -43,7 +43,7 @@ $(STATEDIR)/host-dbus-glib.install: @$(call targetinfo) @$(call world/install, HOST_DBUS_GLIB) install -D -m 644 "$(HOST_DBUS_GLIB_DIR)/dbus-bus-introspect.xml" \ - "$(HOST_DBUS_GLIB_PKGDIR)/share/dbus-glib/dbus-bus-introspect.xml" + "$(HOST_DBUS_GLIB_PKGDIR)/usr/share/dbus-glib/dbus-bus-introspect.xml" @$(call touch) # vim: syntax=make diff --git a/rules/host-dtc.make b/rules/host-dtc.make index 19551203e..586b098bc 100644 --- a/rules/host-dtc.make +++ b/rules/host-dtc.make @@ -30,7 +30,7 @@ HOST_DTC_LICENSE := GPL-2.0-only HOST_DTC_CONF_TOOL := NO HOST_DTC_MAKE_OPT := \ - PREFIX= \ + PREFIX=/usr \ NO_PYTHON=1 \ NO_VALGRIND=1 \ NO_YAML=1 \ diff --git a/rules/host-dummy-install-info.make b/rules/host-dummy-install-info.make index 8f7cf8170..564960408 100644 --- a/rules/host-dummy-install-info.make +++ b/rules/host-dummy-install-info.make @@ -19,7 +19,7 @@ HOST_DUMMY_INSTALL_INFO_LICENSE := ignore $(STATEDIR)/host-dummy-install-info.install: @$(call targetinfo) - @ln -sfv /bin/true $(PTXDIST_SYSROOT_HOST)/bin/install-info + @ln -sfv /bin/true $(PTXDIST_SYSROOT_HOST)/usr/bin/install-info @$(call touch) # vim: syntax=make diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make index 0399aeb31..ebb011186 100644 --- a/rules/host-e2fsprogs.make +++ b/rules/host-e2fsprogs.make @@ -68,24 +68,24 @@ HOST_E2FSPROGS_INSTALL_OPT := install install-libs $(STATEDIR)/host-e2fsprogs.install: @$(call targetinfo) @$(call world/install, HOST_E2FSPROGS) - @mkdir -vp $(HOST_E2FSPROGS_PKGDIR)/sbin/real - @mv -v $(HOST_E2FSPROGS_PKGDIR)/sbin/{mke2fs,mkfs.*} \ - $(HOST_E2FSPROGS_PKGDIR)/sbin/real/ - @echo '#!/bin/sh' > $(HOST_E2FSPROGS_PKGDIR)/sbin/mke2fs - @echo 'export MKE2FS_CONFIG="$$(dirname "$${0}")/../etc/mke2fs.conf"' >> $(HOST_E2FSPROGS_PKGDIR)/sbin/mke2fs - @echo 'exec "$$(dirname "$${0}")/real/$$(basename "$${0}")" "$${@}"' >> $(HOST_E2FSPROGS_PKGDIR)/sbin/mke2fs - @chmod +x $(HOST_E2FSPROGS_PKGDIR)/sbin/mke2fs + @mkdir -vp $(HOST_E2FSPROGS_PKGDIR)/usr/sbin/real + @mv -v $(HOST_E2FSPROGS_PKGDIR)/usr/sbin/{mke2fs,mkfs.*} \ + $(HOST_E2FSPROGS_PKGDIR)/usr/sbin/real/ + @echo '#!/bin/sh' > $(HOST_E2FSPROGS_PKGDIR)/usr/sbin/mke2fs + @echo 'export MKE2FS_CONFIG="$$(dirname "$${0}")/../etc/mke2fs.conf"' >> $(HOST_E2FSPROGS_PKGDIR)/usr/sbin/mke2fs + @echo 'exec "$$(dirname "$${0}")/real/$$(basename "$${0}")" "$${@}"' >> $(HOST_E2FSPROGS_PKGDIR)/usr/sbin/mke2fs + @chmod +x $(HOST_E2FSPROGS_PKGDIR)/usr/sbin/mke2fs @$(foreach mkfs,mkfs.ext2 mkfs.ext3 mkfs.ext4, \ - ln -s mke2fs $(HOST_E2FSPROGS_PKGDIR)/sbin/$(mkfs)$(ptx/nl)) + ln -s mke2fs $(HOST_E2FSPROGS_PKGDIR)/usr/sbin/$(mkfs)$(ptx/nl)) @$(call touch) $(STATEDIR)/host-e2fsprogs.install.post: @$(call targetinfo) @$(call world/install.post, HOST_E2FSPROGS) - @sed -i -e 's,/share,$(PTXDIST_SYSROOT_HOST)/share,' \ - $(PTXDIST_SYSROOT_HOST)/bin/compile_et - @sed -i -e 's,/share,$(PTXDIST_SYSROOT_HOST)/share,' \ - $(PTXDIST_SYSROOT_HOST)/bin/mk_cmds + @sed -i -e 's,/usr/share,$(PTXDIST_SYSROOT_HOST)/usr/share,' \ + $(PTXDIST_SYSROOT_HOST)/usr/bin/compile_et + @sed -i -e 's,/usr/share,$(PTXDIST_SYSROOT_HOST)/usr/share,' \ + $(PTXDIST_SYSROOT_HOST)/usr/bin/mk_cmds @$(call touch) # vim: syntax=make diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make index b0764f0da..9889c28ee 100644 --- a/rules/host-fakeroot.make +++ b/rules/host-fakeroot.make @@ -36,7 +36,7 @@ HOST_FAKEROOT_CONF_ENV := \ HOST_FAKEROOT_CONF_TOOL := autoconf HOST_FAKEROOT_CONF_OPT := \ $(HOST_AUTOCONF) \ - --libdir=/lib/fakeroot + --libdir=/usr/lib/fakeroot HOST_FAKEROOT_INSTALL_OPT := \ SUBDIRS=scripts \ diff --git a/rules/host-figlet.make b/rules/host-figlet.make index f6d5b7c52..7db68926b 100644 --- a/rules/host-figlet.make +++ b/rules/host-figlet.make @@ -15,7 +15,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_FIGLET) += host-figlet # Compile # ---------------------------------------------------------------------------- -HOST_FIGLET_MAKE_OPT := prefix=/ -HOST_FIGLET_INSTALL_OPT := prefix=/ install +HOST_FIGLET_MAKE_OPT := prefix=/usr +HOST_FIGLET_INSTALL_OPT := prefix=/usr install # vim: syntax=make diff --git a/rules/host-file.make b/rules/host-file.make index ef1416723..352a4a4c4 100644 --- a/rules/host-file.make +++ b/rules/host-file.make @@ -14,6 +14,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_FILE) += host-file HOST_FILE_CONF_TOOL := autoconf HOST_FILE_CONF_OPT := \ $(HOST_AUTOCONF) \ - --bindir=/bin/file + --bindir=/usr/bin/file # vim: syntax=make diff --git a/rules/host-glib.make b/rules/host-glib.make index 71973203b..558340a69 100644 --- a/rules/host-glib.make +++ b/rules/host-glib.make @@ -48,12 +48,12 @@ HOST_GLIB_CONF_OPT := \ $(STATEDIR)/host-glib.install.post: @$(call targetinfo) - @mkdir -p $(HOST_GLIB_PKGDIR)/share/glib-2.0/gettext + @mkdir -p $(HOST_GLIB_PKGDIR)/usr/share/glib-2.0/gettext @$(call world/install.post, HOST_GLIB) - @sed -i "s:'/share':'$(PTXDIST_SYSROOT_HOST)/share':" "$(PTXDIST_SYSROOT_HOST)/bin/gdbus-codegen" - @sed -i -e 's:^prefix=.*:prefix=$(PTXDIST_SYSROOT_HOST):' \ - -e 's:^\(datarootdir\|datadir\)=.*:\1=$(PTXDIST_SYSROOT_HOST)/share:' \ - $(PTXDIST_SYSROOT_HOST)/bin/glib-gettextize + @sed -i "s:'/usr/share':'$(PTXDIST_SYSROOT_HOST)/usr/share':" "$(PTXDIST_SYSROOT_HOST)/usr/bin/gdbus-codegen" + @sed -i -e 's:^prefix=.*:prefix=$(PTXDIST_SYSROOT_HOST)/usr:' \ + -e 's:^\(datarootdir\|datadir\)=.*:\1=$(PTXDIST_SYSROOT_HOST)/usr/share:' \ + $(PTXDIST_SYSROOT_HOST)/usr/bin/glib-gettextize @$(call touch) # vim: syntax=make diff --git a/rules/host-gpgme.make b/rules/host-gpgme.make index 13d5be6d3..a98b6a50d 100644 --- a/rules/host-gpgme.make +++ b/rules/host-gpgme.make @@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_GPGME) += host-gpgme HOST_GPGME_CONF_ENV := \ $(HOST_ENV) \ - LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib" + LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/usr/lib" # # autoconf # diff --git a/rules/host-gtk-doc.make b/rules/host-gtk-doc.make index 5245ee351..dcc03916e 100644 --- a/rules/host-gtk-doc.make +++ b/rules/host-gtk-doc.make @@ -50,9 +50,9 @@ $(STATEDIR)/host-gtk-doc.compile: $(STATEDIR)/host-gtk-doc.install: @$(call targetinfo) @install -vD -m644 "$(HOST_GTK_DOC_DIR)/gtk-doc.m4" \ - "$(PTXDIST_SYSROOT_HOST)/share/aclocal/gtk-doc.m4" + "$(PTXDIST_SYSROOT_HOST)/usr/share/aclocal/gtk-doc.m4" @install -vD -m644 "$(HOST_GTK_DOC_DIR)/gtk-doc.make" \ - "$(PTXDIST_SYSROOT_HOST)/share/gtk-doc/data/gtk-doc.make" + "$(PTXDIST_SYSROOT_HOST)/usr/share/gtk-doc/data/gtk-doc.make" @$(call touch) # ---------------------------------------------------------------------------- diff --git a/rules/host-imx-cst.make b/rules/host-imx-cst.make index 16d95505a..42d6f667b 100644 --- a/rules/host-imx-cst.make +++ b/rules/host-imx-cst.make @@ -80,10 +80,10 @@ $(STATEDIR)/host-imx-cst.install: @$(call targetinfo) @$(foreach prog, $(HOST_IMX_CST_PROGS), \ install -v -m0755 -D $(HOST_IMX_CST_DIR)/$(HOST_IMX_CST_ARCH)/bin/$(prog) \ - $(HOST_IMX_CST_PKGDIR)/bin/$(prog)$(ptx/nl)) + $(HOST_IMX_CST_PKGDIR)/usr/bin/$(prog)$(ptx/nl)) @$(foreach lib, $(HOST_IMX_CST_LIBS), \ install -v -m0644 -D $(HOST_IMX_CST_DIR)/$(HOST_IMX_CST_ARCH)/lib/$(lib) \ - $(HOST_IMX_CST_PKGDIR)/lib/imx-cst/$(lib)$(ptx/nl)) + $(HOST_IMX_CST_PKGDIR)/usr/lib/imx-cst/$(lib)$(ptx/nl)) @$(call touch) # vim: syntax=make diff --git a/rules/host-intltool.make b/rules/host-intltool.make index 8f35c414a..825e25705 100644 --- a/rules/host-intltool.make +++ b/rules/host-intltool.make @@ -39,7 +39,7 @@ HOST_INTLTOOL_CONF_TOOL := autoconf $(STATEDIR)/host-intltool.install.post: @$(call targetinfo) @$(call world/install.post, HOST_INTLTOOL) - @sed -i "s;^prefix=$$;prefix=$(PTXDIST_SYSROOT_HOST);" $(PTXDIST_SYSROOT_HOST)/bin/intltoolize + @sed -i "s;^prefix=/usr$$;prefix=$(PTXDIST_SYSROOT_HOST)/usr;" $(PTXDIST_SYSROOT_HOST)/usr/bin/intltoolize @$(call touch) # vim: syntax=make diff --git a/rules/host-jimtcl.make b/rules/host-jimtcl.make index 270e22c88..7763aed25 100644 --- a/rules/host-jimtcl.make +++ b/rules/host-jimtcl.make @@ -43,7 +43,7 @@ HOST_JIMTCL_CONF_OPT := \ $(STATEDIR)/host-jimtcl.install: @$(call targetinfo) @$(call world/install, HOST_JIMTCL) - @ln -sf libjim.so.$(HOST_JIMTCL_VERSION) $(HOST_JIMTCL_PKGDIR)/lib/libjim.so + @ln -sf libjim.so.$(HOST_JIMTCL_VERSION) $(HOST_JIMTCL_PKGDIR)/usr/lib/libjim.so @$(call touch) # vim: syntax=make diff --git a/rules/host-keyutils.make b/rules/host-keyutils.make index eb39268e0..c7b795fb7 100644 --- a/rules/host-keyutils.make +++ b/rules/host-keyutils.make @@ -20,9 +20,11 @@ HOST_KEYUTILS_MAKE_OPT := \ $(HOST_ENV_CC) \ CFLAGS="-O2 -g3 -Wall" \ BUILDFOR="" \ - LIBDIR=/lib \ - USRLIBDIR=/lib \ - INCLUDEDIR=/include + BINDIR=/usr/bin \ + SBINDIR=/usr/bin \ + LIBDIR=/usr/lib \ + USRLIBDIR=/usr/lib \ + INCLUDEDIR=/usr/include HOST_KEYUTILS_INSTALL_OPT := \ $(HOST_KEYUTILS_MAKE_OPT) \ diff --git a/rules/host-libaio.make b/rules/host-libaio.make index 4c428e477..002084e60 100644 --- a/rules/host-libaio.make +++ b/rules/host-libaio.make @@ -17,6 +17,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBAIO) += host-libaio HOST_LIBAIO_CONF_TOOL := NO HOST_LIBAIO_MAKE_ENV := $(HOST_ENV) -HOST_LIBAIO_MAKEVARS := prefix= +HOST_LIBAIO_MAKEVARS := prefix=/usr # vim: syntax=make diff --git a/rules/host-libassuan.make b/rules/host-libassuan.make index 4ee24b734..498d7ba26 100644 --- a/rules/host-libassuan.make +++ b/rules/host-libassuan.make @@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBASSUAN) += host-libassuan HOST_LIBASSUAN_CONF_ENV := \ $(HOST_ENV) \ - LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib" + LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/usr/lib" # # autoconf # diff --git a/rules/host-libcap.make b/rules/host-libcap.make index 695ce6c44..e443a8dce 100644 --- a/rules/host-libcap.make +++ b/rules/host-libcap.make @@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBCAP) += host-libcap # ---------------------------------------------------------------------------- HOST_LIBCAP_MAKE_OPT := \ - prefix= \ + prefix=/usr \ lib=lib \ USE_GPERF=no \ PAM_CAP=no \ diff --git a/rules/host-libcurl.make b/rules/host-libcurl.make index b5387e7c3..509b6c015 100644 --- a/rules/host-libcurl.make +++ b/rules/host-libcurl.make @@ -110,7 +110,7 @@ HOST_LIBCURL_CONF_OPT := \ $(STATEDIR)/host-libcurl.install: @$(call targetinfo) @$(call world/install, HOST_LIBCURL) - @rm -v $(HOST_LIBCURL_PKGDIR)/bin/curl + @rm -v $(HOST_LIBCURL_PKGDIR)/usr/bin/curl @$(call touch) # vim: syntax=make diff --git a/rules/host-libftdi1.make b/rules/host-libftdi1.make index c8fe6510b..a7bff5568 100644 --- a/rules/host-libftdi1.make +++ b/rules/host-libftdi1.make @@ -14,7 +14,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBFTDI1) += host-libftdi1 HOST_LIBFTDI1_CONF_TOOL := cmake HOST_LIBFTDI1_CONF_OPT := \ $(HOST_CMAKE_OPT) \ - -DCMAKE_INSTALL_PREFIX=/ \ -DCMAKE_SKIP_RPATH=ON \ -DBUILD_TESTS=OFF \ -DDOCUMENTATION=OFF \ diff --git a/rules/host-libgcrypt.make b/rules/host-libgcrypt.make index 6cd067bf4..6aec1c70a 100644 --- a/rules/host-libgcrypt.make +++ b/rules/host-libgcrypt.make @@ -39,7 +39,7 @@ $(STATEDIR)/host-libgcrypt.compile: $(STATEDIR)/host-libgcrypt.install: @$(call targetinfo) install -D -m 644 $(HOST_LIBGCRYPT_DIR)/src/libgcrypt.m4 \ - $(HOST_LIBGCRYPT_PKGDIR)/share/aclocal/libgcrypt.m4 + $(HOST_LIBGCRYPT_PKGDIR)/usr/share/aclocal/libgcrypt.m4 @$(call touch) # vim: syntax=make diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make index 8b0764181..f95494084 100644 --- a/rules/host-libkmod.make +++ b/rules/host-libkmod.make @@ -43,7 +43,7 @@ HOST_LIBKMOD_CONF_OPT := \ $(STATEDIR)/host-libkmod.install: @$(call targetinfo) @$(call world/install, HOST_LIBKMOD) - @ln -s ../bin/kmod $(HOST_LIBKMOD_PKGDIR)/sbin/depmod + @ln -s ../bin/kmod $(HOST_LIBKMOD_PKGDIR)/usr/sbin/depmod @$(call touch) # vim: syntax=make diff --git a/rules/host-libp11.make b/rules/host-libp11.make index b7e63ecd3..981fe7507 100644 --- a/rules/host-libp11.make +++ b/rules/host-libp11.make @@ -28,7 +28,7 @@ HOST_LIBP11_CONF_OPT := \ --disable-strict \ --disable-pedantic \ --disable-api-doc \ - --with-enginesdir=/lib/engines-1.1 \ + --with-enginesdir=/usr/lib/engines-1.1 \ --with-pkcs11-module= HOST_LIBP11_MAKE_PAR := NO diff --git a/rules/host-libsepol.make b/rules/host-libsepol.make index 40fd35517..b20b2e113 100644 --- a/rules/host-libsepol.make +++ b/rules/host-libsepol.make @@ -18,11 +18,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBSEPOL) += host-libsepol HOST_LIBSEPOL_CONF_TOOL := NO HOST_LIBSEPOL_MAKE_ENV := \ $(HOST_ENV) \ + SHLIBDIR=$(HOST_LIBSEPOL_PKGDIR)/usr/lib \ CFLAGS="-O2 -Wall -g" -HOST_LIBSEPOL_MAKE_OPT := PREFIX=$(PTXDIST_SYSROOT_HOST) -# no ':=' here -HOST_LIBSEPOL_INSTALL_OPT = \ - PREFIX=$(HOST_LIBSEPOL_PKGDIR) \ - install # vim: syntax=make diff --git a/rules/host-libtirpc.make b/rules/host-libtirpc.make index fef8089fc..4bf50efa5 100644 --- a/rules/host-libtirpc.make +++ b/rules/host-libtirpc.make @@ -31,7 +31,7 @@ HOST_LIBTIRPC_CONF_OPT := \ # Install # ---------------------------------------------------------------------------- -HOST_LIBTIRPC_PC := $(HOST_LIBTIRPC_PKGDIR)/lib/pkgconfig/libtirpc.pc +HOST_LIBTIRPC_PC := $(HOST_LIBTIRPC_PKGDIR)/usr/lib/pkgconfig/libtirpc.pc $(STATEDIR)/host-libtirpc.install: @$(call targetinfo) diff --git a/rules/host-localedef.make b/rules/host-localedef.make index 90ad9ea3f..986441a7f 100644 --- a/rules/host-localedef.make +++ b/rules/host-localedef.make @@ -70,7 +70,7 @@ HOST_LOCALEDEF_INSTALL_OPT := locale/install-others $(STATEDIR)/host-localedef.install: @$(call targetinfo) @install -vD -m755 $(HOST_LOCALEDEF_DIR)-build/locale/localedef \ - $(HOST_LOCALEDEF_PKGDIR)/bin/localedef + $(HOST_LOCALEDEF_PKGDIR)/usr/bin/localedef @$(call touch) # vim: syntax=make diff --git a/rules/host-lz4.make b/rules/host-lz4.make index e9635320e..878f7f003 100644 --- a/rules/host-lz4.make +++ b/rules/host-lz4.make @@ -16,7 +16,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LZ4) += host-lz4 # ---------------------------------------------------------------------------- HOST_LZ4_CONF_TOOL := NO -HOST_LZ4_MAKE_ENV := PREFIX= +HOST_LZ4_MAKE_ENV := PREFIX=/usr HOST_LZ4_MAKE_OPT := BUILD_STATIC=no lz4 HOST_LZ4_INSTALL_OPT := BUILD_STATIC=no install diff --git a/rules/host-mariadb.make b/rules/host-mariadb.make index 2c3ac364b..a0599dfa5 100644 --- a/rules/host-mariadb.make +++ b/rules/host-mariadb.make @@ -95,14 +95,14 @@ $(STATEDIR)/host-mariadb.install: @rm -rf $(HOST_MARIADB_PKGDIR) # # install helper tools @install -vD -m 644 $(HOST_MARIADB_DIR)-build/import_executables.cmake \ - $(HOST_MARIADB_PKGDIR)/share/mariadb/import_executables.cmake - @sed -i 's;$(HOST_MARIADB_DIR)-build/.*/;@SYSROOT@/bin/mariadb/;' \ - $(HOST_MARIADB_PKGDIR)/share/mariadb/import_executables.cmake - @install -vD -m 755 $(HOST_MARIADB_DIR)-build/extra/comp_err $(HOST_MARIADB_PKGDIR)/bin/mariadb/comp_err - @install -vD -m 755 $(HOST_MARIADB_DIR)-build/scripts/comp_sql $(HOST_MARIADB_PKGDIR)/bin/mariadb/comp_sql - @install -vD -m 755 $(HOST_MARIADB_DIR)-build/dbug/factorial $(HOST_MARIADB_PKGDIR)/bin/mariadb/factorial - @install -vD -m 755 $(HOST_MARIADB_DIR)-build/sql/gen_lex_hash $(HOST_MARIADB_PKGDIR)/bin/mariadb/gen_lex_hash - @install -vD -m 755 $(HOST_MARIADB_DIR)-build/sql/gen_lex_token $(HOST_MARIADB_PKGDIR)/bin/mariadb/gen_lex_token + $(HOST_MARIADB_PKGDIR)/usr/share/mariadb/import_executables.cmake + @sed -i 's;$(HOST_MARIADB_DIR)-build/.*/;@SYSROOT@/usr/bin/mariadb/;' \ + $(HOST_MARIADB_PKGDIR)/usr/share/mariadb/import_executables.cmake + @install -vD -m 755 $(HOST_MARIADB_DIR)-build/extra/comp_err $(HOST_MARIADB_PKGDIR)/usr/bin/mariadb/comp_err + @install -vD -m 755 $(HOST_MARIADB_DIR)-build/scripts/comp_sql $(HOST_MARIADB_PKGDIR)/usr/bin/mariadb/comp_sql + @install -vD -m 755 $(HOST_MARIADB_DIR)-build/dbug/factorial $(HOST_MARIADB_PKGDIR)/usr/bin/mariadb/factorial + @install -vD -m 755 $(HOST_MARIADB_DIR)-build/sql/gen_lex_hash $(HOST_MARIADB_PKGDIR)/usr/bin/mariadb/gen_lex_hash + @install -vD -m 755 $(HOST_MARIADB_DIR)-build/sql/gen_lex_token $(HOST_MARIADB_PKGDIR)/usr/bin/mariadb/gen_lex_token @$(call touch) $(STATEDIR)/host-mariadb.install.post: @@ -110,7 +110,7 @@ $(STATEDIR)/host-mariadb.install.post: @$(call world/install.post, HOST_MARIADB) # # correct helper tool paths @sed -i 's;@SYSROOT@;$(PTXDIST_SYSROOT_HOST);' \ - $(PTXDIST_SYSROOT_HOST)/share/mariadb/import_executables.cmake + $(PTXDIST_SYSROOT_HOST)/usr/share/mariadb/import_executables.cmake @$(call touch) # vim: syntax=make diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index c8ebf30e6..3617ded0c 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -104,7 +104,7 @@ HOST_MESALIB_MAKE_OPT := \ $(STATEDIR)/host-mesalib.install: @$(call targetinfo) - install -D -m755 $(HOST_MESALIB_DIR)-build/src/compiler/glsl/glsl_compiler $(HOST_MESALIB_PKGDIR)/bin/mesa/glsl_compiler + install -D -m755 $(HOST_MESALIB_DIR)-build/src/compiler/glsl/glsl_compiler $(HOST_MESALIB_PKGDIR)/usr/bin/mesa/glsl_compiler @$(call touch) # vim: syntax=make diff --git a/rules/host-meson.make b/rules/host-meson.make index 038db5570..574ed064a 100644 --- a/rules/host-meson.make +++ b/rules/host-meson.make @@ -46,18 +46,18 @@ $(STATEDIR)/host-meson.compile: # Special dirs to avoid collisions with host-python3 HOST_MESON_INSTALL_OPT := \ install \ - --prefix=/ \ - --install-lib=/lib/meson \ - --install-scripts=/lib/meson \ - --install-data=/lib/meson \ + --prefix=/usr \ + --install-lib=/usr/lib/meson \ + --install-scripts=/usr/lib/meson \ + --install-data=/usr/lib/meson \ --root=$(HOST_MESON_PKGDIR) $(STATEDIR)/host-meson.install: @$(call targetinfo) @$(call world/execute, HOST_MESON, \ $(SYSTEMPYTHON3) setup.py $(HOST_MESON_INSTALL_OPT)) - @mkdir -vp $(HOST_MESON_PKGDIR)/bin - @ln -svf ../lib/meson/meson $(HOST_MESON_PKGDIR)/bin/meson + @mkdir -vp $(HOST_MESON_PKGDIR)/usr/bin + @ln -svf ../lib/meson/meson $(HOST_MESON_PKGDIR)/usr/bin/meson @$(call touch) $(STATEDIR)/host-meson.install.post: $(PTXDIST_MESON_CROSS_FILE) diff --git a/rules/host-mysql.make b/rules/host-mysql.make index d351b5432..5a027ac04 100644 --- a/rules/host-mysql.make +++ b/rules/host-mysql.make @@ -59,12 +59,10 @@ HOST_MYSQL_CXXFLAGS := -std=c++98 $(STATEDIR)/host-mysql.install: @$(call targetinfo) @$(call world/install, HOST_MYSQL) -# # prefix != /usr is broken, but only sysroot-host/bin is in $PATH - @mv -v $(HOST_MYSQL_PKGDIR)/usr/bin $(HOST_MYSQL_PKGDIR) - @install -v -m755 $(HOST_MYSQL_DIR)-build/sql/gen_lex_hash $(HOST_MYSQL_PKGDIR)/bin/ - @install -v -m755 $(HOST_MYSQL_DIR)-build/sql/gen_lex_token $(HOST_MYSQL_PKGDIR)/bin/ - @install -v -m755 $(HOST_MYSQL_DIR)-build/extra/comp_err $(HOST_MYSQL_PKGDIR)/bin/ - @install -v -m755 $(HOST_MYSQL_DIR)-build/scripts/comp_sql $(HOST_MYSQL_PKGDIR)/bin/ + @install -v -m755 $(HOST_MYSQL_DIR)-build/sql/gen_lex_hash $(HOST_MYSQL_PKGDIR)/usr/bin/ + @install -v -m755 $(HOST_MYSQL_DIR)-build/sql/gen_lex_token $(HOST_MYSQL_PKGDIR)/usr/bin/ + @install -v -m755 $(HOST_MYSQL_DIR)-build/extra/comp_err $(HOST_MYSQL_PKGDIR)/usr/bin/ + @install -v -m755 $(HOST_MYSQL_DIR)-build/scripts/comp_sql $(HOST_MYSQL_PKGDIR)/usr/bin/ @$(call touch) # vim: syntax=make diff --git a/rules/host-ncurses.make b/rules/host-ncurses.make index 74f28dd29..e4a053a35 100644 --- a/rules/host-ncurses.make +++ b/rules/host-ncurses.make @@ -31,8 +31,8 @@ $(STATEDIR)/host-ncurses.install: @$(call targetinfo) @$(call world/install, HOST_NCURSES) # # don't install headers or libs, so packages like the kernel don't use it - @rm -r $(HOST_NCURSES_PKGDIR)/include - @rm -r $(HOST_NCURSES_PKGDIR)/lib/*.a + @rm -r $(HOST_NCURSES_PKGDIR)/usr/include + @rm -r $(HOST_NCURSES_PKGDIR)/usr/lib/*.a @$(call touch) # vim: syntax=make diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make index 2bf5f7971..b69cd76f7 100644 --- a/rules/host-nodejs.make +++ b/rules/host-nodejs.make @@ -22,8 +22,8 @@ HOST_NODEJS_MAKE_ENV := \ HOST_NODEJS_CONF_TOOL := autoconf HOST_NODEJS_CONF_OPT := \ - $(HOST_AUTOCONF) \ - --prefix=/ \ + --prefix=/usr \ + --libdir=lib \ --no-cross-compiling \ --dest-os=linux \ --without-dtrace \ @@ -45,10 +45,10 @@ $(STATEDIR)/host-nodejs.install: @$(call world/install, HOST_NODEJS) # # Needed to cross-compile for target. - @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/bytecode_builtins_list_generator $(HOST_NODEJS_PKGDIR)/bin/ - @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/mkcodecache $(HOST_NODEJS_PKGDIR)/bin/ - @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/node_mksnapshot $(HOST_NODEJS_PKGDIR)/bin/ - @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/torque $(HOST_NODEJS_PKGDIR)/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/bytecode_builtins_list_generator $(HOST_NODEJS_PKGDIR)/usr/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/mkcodecache $(HOST_NODEJS_PKGDIR)/usr/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/node_mksnapshot $(HOST_NODEJS_PKGDIR)/usr/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/torque $(HOST_NODEJS_PKGDIR)/usr/bin/ @$(call touch) diff --git a/rules/host-nss.make b/rules/host-nss.make index b2fb2bd3e..726b9ff8b 100644 --- a/rules/host-nss.make +++ b/rules/host-nss.make @@ -25,7 +25,7 @@ HOST_NSS_MAKE_ENV := \ NS_USE_GCC=1 \ NSS_ENABLE_ECC=1 \ NSS_DISABLE_GTESTS=1 \ - NSPR_INCLUDE_DIR=$(PTXDIST_SYSROOT_HOST)/include/nspr \ + NSPR_INCLUDE_DIR=$(PTXDIST_SYSROOT_HOST)/usr/include/nspr \ $(if $(filter x86_64%,$(GNU_HOST)),USE_64=1) # needed for old glibc and gcc11 @@ -58,14 +58,14 @@ $(STATEDIR)/host-nss.install: @$(foreach lib,$(HOST_NSS_LIBS), \ install -v -m644 -D $(HOST_NSS_DIR)/dist/*/lib/$(lib).so \ - $(HOST_NSS_PKGDIR)/lib/$(lib).so$(ptx/nl)) + $(HOST_NSS_PKGDIR)/usr/lib/$(lib).so$(ptx/nl)) - install -d $(HOST_NSS_PKGDIR)/lib/pkgconfig/ + install -d $(HOST_NSS_PKGDIR)/usr/lib/pkgconfig/ VERSION=$(NSS_VERSION) ptxd_replace_magic \ - $(HOST_NSS_DIR)/nss/nss.pc.in > $(HOST_NSS_PKGDIR)/lib/pkgconfig/nss.pc + $(HOST_NSS_DIR)/nss/nss.pc.in > $(HOST_NSS_PKGDIR)/usr/lib/pkgconfig/nss.pc - install -d $(PTXDIST_SYSROOT_HOST)/include/nss - install -m 644 -t $(PTXDIST_SYSROOT_HOST)/include/nss $(HOST_NSS_DIR)/dist/public/nss/* + install -d $(PTXDIST_SYSROOT_HOST)/usr/include/nss + install -m 644 -t $(PTXDIST_SYSROOT_HOST)/usr/include/nss $(HOST_NSS_DIR)/dist/public/nss/* @$(call touch) diff --git a/rules/host-opensc.make b/rules/host-opensc.make index 421c12539..0319064fd 100644 --- a/rules/host-opensc.make +++ b/rules/host-opensc.make @@ -49,7 +49,7 @@ $(STATEDIR)/host-opensc.install.post: @$(call targetinfo) # # These files are symlinks to ../<name>. PTXdist updates the rpath for # # the real file so it is wrong for the symlink. Fix it here afterwards. - @$(foreach plugin,$(wildcard $(HOST_OPENSC_PKGDIR)/lib/pkcs11/*.so), \ + @$(foreach plugin,$(wildcard $(HOST_OPENSC_PKGDIR)/usr/lib/pkcs11/*.so), \ chrpath --replace '$${ORIGIN}/../' $(plugin) > /dev/null$(ptx/nl)) @$(call world/install.post, HOST_OPENSC) @$(call touch) diff --git a/rules/host-openssl.make b/rules/host-openssl.make index bd2a25126..cc7020814 100644 --- a/rules/host-openssl.make +++ b/rules/host-openssl.make @@ -28,8 +28,8 @@ HOST_OPENSSL_DIR = $(HOST_BUILDDIR)/$(HOST_OPENSSL) # # no ':=' here HOST_OPENSSL_CONF_OPT = \ - --prefix=/ \ - --libdir=/lib \ + --prefix=/usr \ + --libdir=/usr/lib \ shared HOST_OPENSSL_INSTALL_OPT := \ diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make index 0e6e28e9f..a9af478ff 100644 --- a/rules/host-opkg-utils.make +++ b/rules/host-opkg-utils.make @@ -28,6 +28,6 @@ HOST_OPKG_UTILS_LICENSE := GPL-2.0-only # ---------------------------------------------------------------------------- HOST_OPKG_UTILS_CONF_TOOL := NO -HOST_OPKG_UTILS_MAKE_ENV := PREFIX= +HOST_OPKG_UTILS_MAKE_ENV := PREFIX=/usr # vim: syntax=make diff --git a/rules/host-pkg-config.make b/rules/host-pkg-config.make index fea66fb1d..d834193f6 100644 --- a/rules/host-pkg-config.make +++ b/rules/host-pkg-config.make @@ -48,10 +48,10 @@ HOST_PKG_CONFIG_BINCONFIG_GLOB := does-not-exist $(STATEDIR)/host-pkg-config.install: @$(call targetinfo) @$(call world/install, HOST_PKG_CONFIG) - @mv $(HOST_PKG_CONFIG_PKGDIR)/bin/pkg-config \ - $(HOST_PKG_CONFIG_PKGDIR)/bin/pkg-config.real + @mv $(HOST_PKG_CONFIG_PKGDIR)/usr/bin/pkg-config \ + $(HOST_PKG_CONFIG_PKGDIR)/usr/bin/pkg-config.real @ln -sv $(PKG_CONFIG_SCRIPT) \ - $(HOST_PKG_CONFIG_PKGDIR)/bin/pkg-config + $(HOST_PKG_CONFIG_PKGDIR)/usr/bin/pkg-config @$(call touch) # vim: syntax=make diff --git a/rules/host-python3.make b/rules/host-python3.make index f40141ac1..c2afb9624 100644 --- a/rules/host-python3.make +++ b/rules/host-python3.make @@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3) += host-python3 # HOST_PYTHON3_DIR = $(HOST_BUILDDIR)/$(PYTHON3) -HOSTPYTHON3 = $(PTXDIST_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) +HOSTPYTHON3 = $(PTXDIST_SYSROOT_HOST)/usr/bin/python$(PYTHON3_MAJORMINOR) # ---------------------------------------------------------------------------- # Prepare @@ -29,7 +29,7 @@ HOST_PYTHON3_CONF_ENV := \ ac_sys_system=Linux \ ac_sys_release=2 \ MACHDEP=linux \ - LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib" + LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/usr/lib" # # autoconf @@ -39,7 +39,7 @@ HOST_PYTHON3_CONF_TOOL := autoconf # Needed for setup.py to find things in sysroot-host HOST_PYTHON3_CONF_OPT := \ $(HOST_AUTOCONF) \ - --includedir=$(PTXDIST_SYSROOT_HOST)/include \ + --includedir=$(PTXDIST_SYSROOT_HOST)/usr/include \ --enable-shared \ --disable-profiling \ --disable-optimizations \ @@ -57,7 +57,7 @@ HOST_PYTHON3_CONF_OPT := \ --without-dtrace \ --with-computed-gotos \ --without-ensurepip \ - --with-openssl=$(PTXDIST_SYSROOT_HOST) + --with-openssl=$(PTXDIST_SYSROOT_HOST)/usr $(STATEDIR)/host-python3.prepare: @$(call targetinfo) @@ -73,7 +73,7 @@ $(STATEDIR)/host-python3.prepare: # reset INCLUDEDIR for the installation HOST_PYTHON3_INSTALL_OPT := \ - INCLUDEDIR=/include \ + INCLUDEDIR=/usr/include \ install $(STATEDIR)/host-python3.install: @@ -87,15 +87,15 @@ $(STATEDIR)/host-python3.install: # python-$(PYTHON3_MAJORMINOR) # @rm -v \ - "$(HOST_PYTHON3_PKGDIR)/bin/python3" \ - "$(HOST_PYTHON3_PKGDIR)/bin/python3-config" + "$(HOST_PYTHON3_PKGDIR)/usr/bin/python3" \ + "$(HOST_PYTHON3_PKGDIR)/usr/bin/python3-config" @$(call touch) $(STATEDIR)/host-python3.install.post: @$(call targetinfo) @$(call world/install.post, HOST_PYTHON3) - @sed -i 's;prefix_build="";prefix_build="$(PTXDIST_SYSROOT_HOST)";' \ - $(PTXDIST_SYSROOT_HOST)/bin/python3*-config + @sed -i 's;prefix_build="";prefix_build="$(PTXDIST_SYSROOT_HOST)/usr";' \ + $(PTXDIST_SYSROOT_HOST)/usr/bin/python3*-config @$(call touch) # vim: syntax=make diff --git a/rules/host-qemu.make b/rules/host-qemu.make index 31e94f54b..6b0651731 100644 --- a/rules/host-qemu.make +++ b/rules/host-qemu.make @@ -45,7 +45,7 @@ HOST_QEMU_CONF_TOOL := autoconf # Note: not really autoconf: # e.g. there is --enable-debug but not --disable-debug HOST_QEMU_CONF_OPT := \ - --prefix=/. \ + --prefix=/usr \ --target-list=" \ $(call ptx/ifdef, PTXCONF_HOST_QEMU_SYS,$(HOST_QEMU_SYS_TARGETS),) \ $(call ptx/ifdef, PTXCONF_HOST_QEMU_USR,$(HOST_QEMU_USR_TARGETS),) \ @@ -194,7 +194,7 @@ QEMU_CROSS_TOOLEXECLIBDIR = $(shell dirname $$(realpath $$(ptxd_cross_cc -print- QEMU_CROSS_LD_LIBRARY_PATH = $(PTXDIST_SYSROOT_TOOLCHAIN)/lib:$(QEMU_CROSS_TOOLEXECLIBDIR):$(SYSROOT)/$(CROSS_LIB_DIR):$(SYSROOT)/usr/$(CROSS_LIB_DIR) QEMU_CROSS_QEMU_ENV = \ - QEMU="$(PTXDIST_SYSROOT_HOST)/bin/qemu-$(HOST_QEMU_TARGETS)" \ + QEMU="$(PTXDIST_SYSROOT_HOST)/usr/bin/qemu-$(HOST_QEMU_TARGETS)" \ KERNEL_VERSION="$(KERNEL_VERSION)" \ QEMU_LD_PREFIX="$(PTXDIST_SYSROOT_TOOLCHAIN)" \ QEMU_LD_LIBRARY_PATH="$(QEMU_CROSS_LD_LIBRARY_PATH)" \ @@ -205,7 +205,7 @@ $(STATEDIR)/host-qemu.install: @$(call world/install, HOST_QEMU) ifdef PTXCONF_HOST_QEMU_SYS # # necessary for qemu to find its ROM files - @ln -vsf share/qemu $(HOST_QEMU_PKGDIR)/pc-bios + @ln -vsf share/qemu $(HOST_QEMU_PKGDIR)/usr/pc-bios endif @$(call touch) @@ -213,16 +213,16 @@ $(STATEDIR)/host-qemu.install.post: @$(call targetinfo) @$(call world/install.post, HOST_QEMU) ifdef PTXCONF_HOST_QEMU_USR - @$(QEMU_CROSS_QEMU_ENV) ptxd_replace_magic $(QEMU_CROSS_QEMU) > $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross - @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross - @install -d -m 755 $(PTXDIST_SYSROOT_CROSS)/bin/qemu/ + @$(QEMU_CROSS_QEMU_ENV) ptxd_replace_magic $(QEMU_CROSS_QEMU) > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross + @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross + @install -d -m 755 $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ @sed \ -e 's|RTLDLIST=.*|RTLDLIST="$(PTXDIST_SYSROOT_TOOLCHAIN)$(QEMU_CROSS_DL)"|' \ - -e 's|eval $$add_env|eval $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross -E "$${add_env// /,}"|' \ - -e 's|verify_out=`|verify_out=`$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross |' \ + -e 's|eval $$add_env|eval $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross -E "$${add_env// /,}"|' \ + -e 's|verify_out=`|verify_out=`$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross |' \ -e 's|#! */.*$$|#!$(shell readlink $(PTXDIST_TOPDIR)/bin/bash)|' \ - $(PTXDIST_SYSROOT_TOOLCHAIN)/usr/bin/ldd > $(PTXDIST_SYSROOT_CROSS)/bin/qemu/ldd - @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qemu/ldd + $(PTXDIST_SYSROOT_TOOLCHAIN)/usr/bin/ldd > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd + @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd endif @$(call touch) diff --git a/rules/host-qt5.make b/rules/host-qt5.make index f36e5fcff..165ff5adb 100644 --- a/rules/host-qt5.make +++ b/rules/host-qt5.make @@ -27,12 +27,12 @@ HOST_QT5_CONF_ENV := \ # HOST_QT5_CONF_TOOL := autoconf HOST_QT5_CONF_OPT := \ - -prefix / \ - -bindir /bin/qt5 \ - -headerdir /include/qt5 \ - -archdatadir /lib/qt5 \ - -datadir /share/qt5 \ - -hostbindir /bin/qt5 \ + -prefix /usr \ + -bindir /usr/bin/qt5 \ + -headerdir /usr/include/qt5 \ + -archdatadir /usr/lib/qt5 \ + -datadir /usr/share/qt5 \ + -hostbindir /usr/bin/qt5 \ $(if $(filter 1,$(PTXDIST_VERBOSE)),-v) \ -opensource \ -confirm-license \ @@ -159,7 +159,7 @@ HOST_QT5_CONF_OPT := \ HOST_QT5_CONF_OPT += \ --disable-sm -HOST_QT5_QT_CONF := $(PTXDIST_SYSROOT_HOST)/bin/qt5/qt.conf +HOST_QT5_QT_CONF := $(PTXDIST_SYSROOT_HOST)/usr/bin/qt5/qt.conf HOST_QT5_MAKE_ENV := \ ICECC_REMOTE_CPP=0 @@ -167,15 +167,15 @@ HOST_QT5_MAKE_ENV := \ $(STATEDIR)/host-qt5.install.post: @$(call targetinfo) @$(call world/install.post, HOST_QT5) - @echo "[Paths]" > $(HOST_QT5_QT_CONF) - @echo "HostPrefix=$(PTXDIST_SYSROOT_HOST)" >> $(HOST_QT5_QT_CONF) - @echo "HostData=$(PTXDIST_SYSROOT_HOST)/lib/qt5" >> $(HOST_QT5_QT_CONF) - @echo "HostBinaries=$(PTXDIST_SYSROOT_HOST)/bin/qt5" >> $(HOST_QT5_QT_CONF) - @echo "Prefix=$(PTXDIST_SYSROOT_HOST)" >> $(HOST_QT5_QT_CONF) - @echo "Headers=$(PTXDIST_SYSROOT_HOST)/include/qt5" >> $(HOST_QT5_QT_CONF) - @echo "Data=$(PTXDIST_SYSROOT_HOST)/share/qt5" >> $(HOST_QT5_QT_CONF) - @echo "Binaries=$(PTXDIST_SYSROOT_HOST)/bin/qt5" >> $(HOST_QT5_QT_CONF) - @echo "" >> $(HOST_QT5_QT_CONF) + @echo "[Paths]" > $(HOST_QT5_QT_CONF) + @echo "HostPrefix=$(PTXDIST_SYSROOT_HOST)/usr" >> $(HOST_QT5_QT_CONF) + @echo "HostData=$(PTXDIST_SYSROOT_HOST)/usr/lib/qt5" >> $(HOST_QT5_QT_CONF) + @echo "HostBinaries=$(PTXDIST_SYSROOT_HOST)/usr/bin/qt5" >> $(HOST_QT5_QT_CONF) + @echo "Prefix=$(PTXDIST_SYSROOT_HOST)/usr" >> $(HOST_QT5_QT_CONF) + @echo "Headers=$(PTXDIST_SYSROOT_HOST)/usr/include/qt5" >> $(HOST_QT5_QT_CONF) + @echo "Data=$(PTXDIST_SYSROOT_HOST)/usr/share/qt5" >> $(HOST_QT5_QT_CONF) + @echo "Binaries=$(PTXDIST_SYSROOT_HOST)/usr/bin/qt5" >> $(HOST_QT5_QT_CONF) + @echo "" >> $(HOST_QT5_QT_CONF) @$(call touch) # vim: syntax=make diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make index ec04f713c..d24accd91 100644 --- a/rules/host-squashfs-tools.make +++ b/rules/host-squashfs-tools.make @@ -27,8 +27,8 @@ HOST_SQUASHFS_TOOLS_MAKE_OPT := \ XZ_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_XZ_SUPPORT,1,0) \ ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0) -HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz" +HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/usr/lib/xz" HOST_SQUASHFS_TOOLS_MAKE_PAR := NO -HOST_SQUASHFS_TOOLS_INSTALL_OPT = install INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/sbin" +HOST_SQUASHFS_TOOLS_INSTALL_OPT = install INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/usr/sbin" # vim: syntax=make diff --git a/rules/host-systemd.make b/rules/host-systemd.make index c03670821..5f5fa5bae 100644 --- a/rules/host-systemd.make +++ b/rules/host-systemd.make @@ -168,11 +168,11 @@ HOST_SYSTEMD_MAKE_OPT := systemd-hwdb $(STATEDIR)/host-systemd.install: @$(call targetinfo) - @rm -rf $(HOST_SYSTEMD_PKGDIR) + @rm -rf $(HOST_SYSTEMD_PKGDIR)/usr @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/systemd-hwdb \ - $(HOST_SYSTEMD_PKGDIR)/bin/systemd-hwdb + $(HOST_SYSTEMD_PKGDIR)/usr/bin/systemd-hwdb @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/src/shared/libsystemd-shared-$(SYSTEMD_VERSION_MAJOR).so \ - $(HOST_SYSTEMD_PKGDIR)/lib/libsystemd-shared-$(SYSTEMD_VERSION_MAJOR).so + $(HOST_SYSTEMD_PKGDIR)/usr/lib/libsystemd-shared-$(SYSTEMD_VERSION_MAJOR).so @$(call touch) # vim: syntax=make diff --git a/rules/host-tf-a.make b/rules/host-tf-a.make index 9b4a94f7a..38f000642 100644 --- a/rules/host-tf-a.make +++ b/rules/host-tf-a.make @@ -14,7 +14,7 @@ HOST_TF_A_MAKE_OPT = fiptool $(STATEDIR)/host-tf-a.install: @$(call targetinfo) - install -vD -m755 $(HOST_TF_A_DIR)/tools/fiptool/fiptool $(HOST_TF_A_PKGDIR)/bin/fiptool + install -vD -m755 $(HOST_TF_A_DIR)/tools/fiptool/fiptool $(HOST_TF_A_PKGDIR)/usr/bin/fiptool @$(call touch) # vim: syntax=make diff --git a/rules/host-timeout.make b/rules/host-timeout.make index 73f240f3a..cffe012d6 100644 --- a/rules/host-timeout.make +++ b/rules/host-timeout.make @@ -31,7 +31,7 @@ HOST_TIMEOUT_MAKE_OPT := ../../bin/timeout $(STATEDIR)/host-timeout.install: @$(call targetinfo) @$(INSTALL) -v -m 755 -D $(HOST_TIMEOUT_DIR)/bin/timeout \ - $(PTXDIST_SYSROOT_HOST)/bin/timeout + $(PTXDIST_SYSROOT_HOST)/usr/bin/timeout @$(call touch) # vim: syntax=make diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make index 3a980dd76..d4d245b6b 100644 --- a/rules/host-u-boot-tools.make +++ b/rules/host-u-boot-tools.make @@ -32,7 +32,7 @@ $(STATEDIR)/host-u-boot-tools.install: @$(call targetinfo) @$(foreach prog, $(HOST_U_BOOT_TOOLS_PROGS), \ install -vD $(HOST_U_BOOT_TOOLS_DIR)/tools/$(prog) \ - $(HOST_U_BOOT_TOOLS_PKGDIR)/bin/$(prog)$(ptx/nl)) + $(HOST_U_BOOT_TOOLS_PKGDIR)/usr/bin/$(prog)$(ptx/nl)) @$(call touch) diff --git a/rules/host-xcb-proto.make b/rules/host-xcb-proto.make index a498d74c5..9632d7f09 100644 --- a/rules/host-xcb-proto.make +++ b/rules/host-xcb-proto.make @@ -24,8 +24,5 @@ HOST_XCB_PROTO_CONF_ENV := \ # autoconf # HOST_XCB_PROTO_CONF_TOOL := autoconf -# without this special prefix the xcb-proto.pc is broken -HOST_XCB_PROTO_CONF_OPT := \ - --prefix=/. # vim: syntax=make diff --git a/rules/host-xorg-server.make b/rules/host-xorg-server.make index 8d42f6c64..3de131b7f 100644 --- a/rules/host-xorg-server.make +++ b/rules/host-xorg-server.make @@ -40,7 +40,7 @@ $(STATEDIR)/host-xorg-server.compile: $(STATEDIR)/host-xorg-server.install: @$(call targetinfo) install -D -m 644 $(HOST_XORG_SERVER_DIR)/xorg-server.m4 \ - $(HOST_XORG_SERVER_PKGDIR)/share/aclocal/xorg-server.m4 + $(HOST_XORG_SERVER_PKGDIR)/usr/share/aclocal/xorg-server.m4 @$(call touch) # vim: syntax=make diff --git a/rules/host-yarn.make b/rules/host-yarn.make index 3669970e5..2c725d735 100644 --- a/rules/host-yarn.make +++ b/rules/host-yarn.make @@ -56,7 +56,7 @@ $(STATEDIR)/host-yarn.install: @$(call targetinfo) @$(call world/execute, HOST_YARN, \ install -vDm 0755 $(HOST_YARN_SOURCE) \ - $(HOST_YARN_PKGDIR)/bin/yarn) + $(HOST_YARN_PKGDIR)/usr/bin/yarn) @$(call touch) # vim: syntax=make diff --git a/rules/jimtcl.make b/rules/jimtcl.make index 54029f895..29a9d85a3 100644 --- a/rules/jimtcl.make +++ b/rules/jimtcl.make @@ -36,7 +36,7 @@ JIMTCL_CONF_TOOL := autoconf JIMTCL_CONF_ENV := \ $(CROSS_ENV) \ CCACHE=none \ - autosetup_tclsh=$(PTXDIST_SYSROOT_HOST)/bin/jimsh + autosetup_tclsh=$(PTXDIST_SYSROOT_HOST)/usr/bin/jimsh JIMTCL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(call ptx/ifdef, PTXCONF_JIMTCL_UTF8,--utf8,) \ diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make index 126d01994..1e415fd2c 100644 --- a/rules/libgcrypt.make +++ b/rules/libgcrypt.make @@ -38,7 +38,7 @@ endif LIBGCRYPT_CONF_ENV := \ $(CROSS_ENV) \ - ac_cv_path_GPGRT_CONFIG=$(PTXDIST_SYSROOT_CROSS)/bin/gpgrt-config + ac_cv_path_GPGRT_CONFIG=$(PTXDIST_SYSROOT_CROSS)/usr/bin/gpgrt-config ifdef PTXCONF_ARCH_X86 LIBGCRYPT_CONF_ENV += ac_cv_sys_symbol_underscore=no diff --git a/rules/libsepol.make b/rules/libsepol.make index f58aa1739..cf5f4ef4d 100644 --- a/rules/libsepol.make +++ b/rules/libsepol.make @@ -30,6 +30,7 @@ LIBSEPOL_LICENSE := LGPL-2.1-or-later LIBSEPOL_CONF_TOOL := NO LIBSEPOL_MAKE_ENV := \ $(CROSS_ENV) \ + SHLIBDIR=$(LIBSEPOL_PKGDIR)/usr/lib \ CFLAGS="-O2 -Wall -g" # ---------------------------------------------------------------------------- diff --git a/rules/mariadb.make b/rules/mariadb.make index b0088f40e..a5a357157 100644 --- a/rules/mariadb.make +++ b/rules/mariadb.make @@ -88,7 +88,7 @@ MARIADB_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DBUILD_CONFIG=mysql_release \ -DSTACK_DIRECTION=1 \ - -DIMPORT_EXECUTABLES=$(PTXDIST_SYSROOT_HOST)/share/mariadb/import_executables.cmake \ + -DIMPORT_EXECUTABLES=$(PTXDIST_SYSROOT_HOST)/usr/share/mariadb/import_executables.cmake \ -DHAVE_LLVM_LIBCPP_EXITCODE=no \ -DCOMMUNITY_BUILD=ON \ -DCONNECT_WITH_JDBC=OFF \ diff --git a/rules/mesalib.make b/rules/mesalib.make index 686a961c6..fce66ff52 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -233,7 +233,7 @@ endif $(STATEDIR)/mesalib.compile: @$(call targetinfo) - cp $(PTXDIST_SYSROOT_HOST)/bin/mesa/glsl_compiler $(MESALIB_DIR)/src/compiler/ + cp $(PTXDIST_SYSROOT_HOST)/usr/bin/mesa/glsl_compiler $(MESALIB_DIR)/src/compiler/ @$(call world/compile, MESALIB) @$(call touch) diff --git a/rules/mysql.make b/rules/mysql.make index d406bee4a..a2131332e 100644 --- a/rules/mysql.make +++ b/rules/mysql.make @@ -94,12 +94,12 @@ MYSQL_CXXFLAGS := -std=c++98 $(STATEDIR)/mysql.compile: @$(call targetinfo) - @install -v -m755 $(PTXDIST_SYSROOT_HOST)/bin/gen_lex_hash $(MYSQL_DIR)-build/sql/ - @install -v -m755 $(PTXDIST_SYSROOT_HOST)/bin/gen_lex_token $(MYSQL_DIR)-build/sql/ - @install -v -m755 $(PTXDIST_SYSROOT_HOST)/bin/lz4_decompress $(MYSQL_DIR)-build/extra/ - @install -v -m755 $(PTXDIST_SYSROOT_HOST)/bin/zlib_decompress $(MYSQL_DIR)-build/extra/ - @install -v -m755 $(PTXDIST_SYSROOT_HOST)/bin/comp_err $(MYSQL_DIR)-build/extra/ - @install -v -m755 $(PTXDIST_SYSROOT_HOST)/bin/comp_sql $(MYSQL_DIR)-build/scripts/ + @install -v -m755 $(PTXDIST_SYSROOT_HOST)/usr/bin/gen_lex_hash $(MYSQL_DIR)-build/sql/ + @install -v -m755 $(PTXDIST_SYSROOT_HOST)/usr/bin/gen_lex_token $(MYSQL_DIR)-build/sql/ + @install -v -m755 $(PTXDIST_SYSROOT_HOST)/usr/bin/lz4_decompress $(MYSQL_DIR)-build/extra/ + @install -v -m755 $(PTXDIST_SYSROOT_HOST)/usr/bin/zlib_decompress $(MYSQL_DIR)-build/extra/ + @install -v -m755 $(PTXDIST_SYSROOT_HOST)/usr/bin/comp_err $(MYSQL_DIR)-build/extra/ + @install -v -m755 $(PTXDIST_SYSROOT_HOST)/usr/bin/comp_sql $(MYSQL_DIR)-build/scripts/ @$(call world/compile, MYSQL) @$(call touch) diff --git a/rules/ncurses.make b/rules/ncurses.make index 8d29ff936..1b5a50586 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -31,7 +31,7 @@ NCURSES_LICENSE_FILES := file://COPYING;md5=afd8d0a6ec9c24941eb06bc5e4017918 NCURSES_CONF_TOOL := autoconf NCURSES_CONF_ENV := \ $(CROSS_ENV) \ - TIC_PATH="$(PTXDIST_SYSROOT_HOST)/bin/tic" + TIC_PATH="$(PTXDIST_SYSROOT_HOST)/usr/bin/tic" NCURSES_SHARED_TARGET := y NCURSES_SHARED_HOST := @@ -125,9 +125,9 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR # For this, the links at runtime are required # @for lib in $(NCURSES_LIBRARY_LIST); do \ - echo "INPUT(-l$${lib}w)" > $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/lib$${lib}.so ; \ + echo "INPUT(-l$${lib}w)" > $(NCURSES_PKGDIR)/usr/$(CROSS_LIB_DIR)/lib$${lib}.so ; \ done - @echo "INPUT(-lncursesw)" > $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/libcurses.so + @echo "INPUT(-lncursesw)" > $(NCURSES_PKGDIR)/usr/$(CROSS_LIB_DIR)/libcurses.so @ln -sf "ncursesw$(NCURSES_MAJOR)-config" \ "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config" @@ -142,7 +142,7 @@ endif $(STATEDIR)/ncurses.install.post: @$(call targetinfo) @$(call world/install.post, NCURSES) - @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/"*config* "$(PTXDIST_SYSROOT_CROSS)/bin" + @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/"*config* "$(PTXDIST_SYSROOT_CROSS)/usr/bin" @$(call touch) # ---------------------------------------------------------------------------- diff --git a/rules/nfsutils.make b/rules/nfsutils.make index 32600a803..3e006e249 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -69,7 +69,7 @@ NFSUTILS_CONF_OPT := \ --with-statdpath=/var/lib/nfs \ --with-statduser=rpcuser \ --with-systemd=/usr/lib/systemd/system \ - --with-rpcgen=$(PTXDIST_SYSROOT_HOST)/bin/rpcgen \ + --with-rpcgen=$(PTXDIST_SYSROOT_HOST)/usr/bin/rpcgen \ --without-mountfile \ --without-tcp-wrappers \ --without-krb5 \ diff --git a/rules/nodejs.make b/rules/nodejs.make index 2330e98a3..7c80647df 100644 --- a/rules/nodejs.make +++ b/rules/nodejs.make @@ -89,7 +89,7 @@ $(STATEDIR)/nodejs.prepare: # # to the pre-built host tool binaries, which are different for # # each individual checkout of a BSP. -_- $(foreach f,$(NODEJS_HOST_TOOLS), \ - sed -i -e "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/bin/$(f)#" \ + sed -i -e "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/usr/bin/$(f)#" \ $(NODEJS_DIR)/node.gyp $(NODEJS_DIR)/tools/v8_gypfiles/v8.gyp $(ptx/nl)) @$(call world/prepare, NODEJS) diff --git a/rules/opencv.make b/rules/opencv.make index 476f6007a..eade1bcb7 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -146,7 +146,7 @@ OPENCV_CONF_OPT := \ -DOPENCV_PYTHON3_VERSION=$(PYTHON3_MAJORMINOR) \ -DOPENCV_WARNINGS_ARE_ERRORS=OFF \ -DPROTOBUF_UPDATE_FILES=OFF \ - -DPYTHON3_EXECUTABLE=$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) \ + -DPYTHON3_EXECUTABLE=$(PTXDIST_SYSROOT_CROSS)/usr/bin/python$(PYTHON3_MAJORMINOR) \ -DPYTHON3_NUMPY_INCLUDE_DIRS=$(PTXDIST_SYSROOT_TARGET)$(PYTHON3_SITEPACKAGES)/numpy/core/include/ \ -DWITH_1394=OFF \ -DWITH_ADE=OFF \ diff --git a/rules/perl.make b/rules/perl.make index 497d0535f..7e6da10c0 100644 --- a/rules/perl.make +++ b/rules/perl.make @@ -38,7 +38,7 @@ PERL_DEVPKG := NO # use by perl modules PERL_SITELIB := /usr/lib/perl5/site_perl/$(PERL_VERSION) -CROSS_PERL= $(PTXDIST_SYSROOT_CROSS)/bin/cross-perl +CROSS_PERL= $(PTXDIST_SYSROOT_CROSS)/usr/bin/cross-perl # ---------------------------------------------------------------------------- # Extract diff --git a/rules/pre/010-code-signing.make b/rules/pre/010-code-signing.make index 370595600..eb55263ec 100644 --- a/rules/pre/010-code-signing.make +++ b/rules/pre/010-code-signing.make @@ -7,9 +7,9 @@ # CODE_SIGNING_ENV = \ - SO_PATH=$(PTXDIST_SYSROOT_HOST)/lib/engines-1.1/pkcs11.so \ - OPENSSL_CONF="$(PTXDIST_SYSROOT_HOST)/ssl/openssl.cnf" \ - OPENSSL_ENGINES="$(PTXDIST_SYSROOT_HOST)/lib/engines-1.1" + SO_PATH=$(PTXDIST_SYSROOT_HOST)/usr/lib/engines-1.1/pkcs11.so \ + OPENSSL_CONF="$(PTXDIST_SYSROOT_HOST)/usr/ssl/openssl.cnf" \ + OPENSSL_ENGINES="$(PTXDIST_SYSROOT_HOST)/usr/lib/engines-1.1" # # This macro is used to allow a code signing provider diff --git a/rules/pre/020-code-signing-softhsm.make b/rules/pre/020-code-signing-softhsm.make index 7d9cae556..62e3ab331 100644 --- a/rules/pre/020-code-signing-softhsm.make +++ b/rules/pre/020-code-signing-softhsm.make @@ -9,7 +9,7 @@ ifdef PTXCONF_HOST_SOFTHSM SOFTHSM_CODE_SIGNING_ENV = \ SOFTHSM2_CONF="$(PTXDIST_SYSROOT_HOST)/etc/softhsm2.conf" \ - PKCS11_MODULE_PATH=$(PTXDIST_SYSROOT_HOST)/lib/softhsm/libsofthsm2.so + PKCS11_MODULE_PATH=$(PTXDIST_SYSROOT_HOST)/usr/lib/softhsm/libsofthsm2.so CODE_SIGNING_ENV += \ $(SOFTHSM_CODE_SIGNING_ENV) diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 46f6f872e..fd12a3462 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -14,7 +14,7 @@ GNU_HOST := $(call ptx/force-sh, echo $(GNU_BUILD) | sed s/-[a-zA-Z0-9_]*-/-host INSTALL := install -FAKEROOT := $(PTXDIST_SYSROOT_HOST)/bin/fakeroot +FAKEROOT := $(PTXDIST_SYSROOT_HOST)/usr/bin/fakeroot CHECK_PIPE_STATUS := \ for i in "$${PIPESTATUS[@]}"; do [ $$i -gt 0 ] && { \ @@ -29,7 +29,7 @@ CHECK_PIPE_STATUS := \ # # prepare the search path when cross compiling # -CROSS_PATH := $(PTXDIST_SYSROOT_CROSS)/bin:$(PTXDIST_SYSROOT_CROSS)/sbin:$(PATH) +CROSS_PATH := $(PTXDIST_SYSROOT_CROSS)/usr/bin:$(PTXDIST_SYSROOT_CROSS)/usr/sbin:$(PATH) # ---------------------------------------------------------------------------- @@ -250,7 +250,7 @@ CROSS_QMAKE_OPT := \ $(if $(filter 0,$(PTXDIST_VERBOSE)),CONFIG+=silent) CROSS_PYTHON_INSTALL := install --prefix=/usr -HOST_PYTHON_INSTALL := install --prefix=/. +HOST_PYTHON_INSTALL := install --prefix=/usr CROSS_MESON_USR := \ --cross-file '${PTXDIST_MESON_CROSS_FILE}' \ @@ -320,16 +320,25 @@ HOST_ENV := \ $(HOST_ENV_PKG_CONFIG) -HOST_AUTOCONF := --prefix= -HOST_AUTOCONF_SYSROOT := --prefix=$(PTXDIST_SYSROOT_HOST) +HOST_AUTOCONF := \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib + +HOST_AUTOCONF_SYSROOT := \ + --prefix=$(PTXDIST_SYSROOT_HOST)/usr \ + --sysconfdir=$(PTXDIST_SYSROOT_HOST)/etc \ + --libdir=$(PTXDIST_SYSROOT_HOST)/usr/lib HOST_CMAKE_OPT := \ - -DCMAKE_INSTALL_PREFIX= \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DCMAKE_TOOLCHAIN_FILE='${PTXDIST_CMAKE_TOOLCHAIN_HOST}' HOST_CMAKE_OPT_SYSROOT := \ - -DCMAKE_INSTALL_PREFIX=$(PTXDIST_SYSROOT_HOST) \ + -DCMAKE_INSTALL_PREFIX=$(PTXDIST_SYSROOT_HOST)/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DCMAKE_TOOLCHAIN_FILE='${PTXDIST_CMAKE_TOOLCHAIN_HOST}' @@ -338,7 +347,7 @@ HOST_MESON_OPT := \ -Dbackend=ninja \ -Dbuildtype=debugoptimized \ -Dlibdir=lib \ - -Dprefix=/ + -Dprefix=/usr HOST_CARGO_OPT := \ build \ @@ -356,8 +365,17 @@ HOST_CROSS_ENV := $(HOST_ENV) HOST_CROSS_AUTOCONF_ARCH := --target=$(PTXCONF_GNU_TARGET) -HOST_CROSS_AUTOCONF := --prefix= $(HOST_CROSS_AUTOCONF_ARCH) -HOST_CROSS_AUTOCONF_SYSROOT := --prefix=$(PTXDIST_SYSROOT_CROSS) $(HOST_CROSS_AUTOCONF_ARCH) +HOST_CROSS_AUTOCONF := \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + $(HOST_CROSS_AUTOCONF_ARCH) + +HOST_CROSS_AUTOCONF_SYSROOT := \ + --prefix=$(PTXDIST_SYSROOT_CROSS)/usr \ + --sysconfdir=$(PTXDIST_SYSROOT_CROSS)/etc \ + --libdir=$(PTXDIST_SYSROOT_CROSS)/usr/lib \ + $(HOST_CROSS_AUTOCONF_ARCH) # ---------------------------------------------------------------------------- # Convenience macros @@ -391,7 +409,7 @@ add_locale = \ fi; \ ${CROSS_ENV_CC} $(CROSS_ENV_STRIP) \ $(SCRIPTSDIR)/make_locale.sh \ - -e $(PTXDIST_SYSROOT_HOST)/bin/localedef \ + -e $(PTXDIST_SYSROOT_HOST)/usr/bin/localedef \ -f $$CHARMAP -i $$LOCALE_DEF \ -p $$PREF \ -n $$LOCALE_NAME \ diff --git a/rules/protobuf.make b/rules/protobuf.make index a5c126443..f66811b26 100644 --- a/rules/protobuf.make +++ b/rules/protobuf.make @@ -36,7 +36,7 @@ PROTOBUF_CONF_OPT := \ --disable-64bit-solaris \ --disable-static \ --$(call ptx/wwo, PTXCONF_PROTOBUF_ZLIB)-zlib \ - --with-protoc=$(PTXDIST_SYSROOT_HOST)/bin/protoc + --with-protoc=$(PTXDIST_SYSROOT_HOST)/usr/bin/protoc # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make index d7a294967..d33b31a7e 100644 --- a/rules/pulseaudio.make +++ b/rules/pulseaudio.make @@ -91,7 +91,7 @@ PULSEAUDIO_CONF_OPT := \ -Dtcpwrap=disabled \ -Dtests=false \ -Dudev=enabled \ - -Dudevrulesdir=/lib/udev/rules.d \ + -Dudevrulesdir=/usr/lib/udev/rules.d \ -Dvalgrind=disabled \ -Dwebrtc-aec=$(call ptx/endis, PTXCONF_PULSEAUDIO_WEBRTC_AEC)d \ -Dx11=disabled \ diff --git a/rules/python3.make b/rules/python3.make index b18582563..b8cffc190 100644 --- a/rules/python3.make +++ b/rules/python3.make @@ -29,7 +29,7 @@ PYTHON3_URL := \ https://www.python.org/ftp/python/$(PYTHON3_VERSION)/$(PYTHON3).$(PYTHON3_SUFFIX) \ http://python.org/ftp/python/$(PYTHON3_MAJORMINOR)/$(PYTHON3).$(PYTHON3_SUFFIX) -CROSS_PYTHON3 := $(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) +CROSS_PYTHON3 := $(PTXDIST_SYSROOT_CROSS)/usr/bin/python$(PYTHON3_MAJORMINOR) # ---------------------------------------------------------------------------- # Prepare @@ -114,7 +114,7 @@ $(STATEDIR)/python3.install.post: @echo '_PYTHON_HOST_PLATFORM=linux-$(PYTHON3_PLATFORM)' >> "$(CROSS_PYTHON3)" @m=`sed -n 's/^MULTIARCH=[\t ]*\(.*\)/\1/p' $(PYTHON3_DIR)/Makefile` && \ d=`cat $(PYTHON3_DIR)/pybuilddir.txt` && \ - cross_dir="$(PTXDIST_SYSROOT_CROSS)/lib/python$(PYTHON3_MAJORMINOR)" && \ + cross_dir="$(PTXDIST_SYSROOT_CROSS)/usr/lib/python$(PYTHON3_MAJORMINOR)" && \ mkdir -p "$${cross_dir}" && \ cp "$(PYTHON3_DIR)/$$d/_sysconfigdata__linux_$${m}.py" "$${cross_dir}" && \ echo "_PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__linux_$$m" >> "$(CROSS_PYTHON3)" && \ @@ -127,8 +127,8 @@ $(STATEDIR)/python3.install.post: @chmod a+x "$(CROSS_PYTHON3)" @sed -e 's;prefix_real=.*;prefix_real=$(SYSROOT)/usr;' \ "$(PTXDIST_SYSROOT_TARGET)/usr/bin/python$(PYTHON3_MAJORMINOR)-config" \ - > "$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" - @chmod +x "$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" + > "$(PTXDIST_SYSROOT_CROSS)/usr/bin/python$(PYTHON3_MAJORMINOR)-config" + @chmod +x "$(PTXDIST_SYSROOT_CROSS)/usr/bin/python$(PYTHON3_MAJORMINOR)-config" # # make sure grammar pickle is generated to avoid parallel building issues @"$(CROSS_PYTHON3)" -c 'from setuptools.command import build_py' @@ -186,8 +186,8 @@ $(STATEDIR)/python3.clean: @$(call clean_pkg, PYTHON3) @rm -vf \ "$(CROSS_PYTHON3)" \ - "$(PTXDIST_SYSROOT_CROSS)/bin/python3" \ - "$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" \ - "$(PTXDIST_SYSROOT_CROSS)/lib/python$(PYTHON3_MAJORMINOR)/"_sysconfigdata_m_linux_*.py + "$(PTXDIST_SYSROOT_CROSS)/usr/bin/python3" \ + "$(PTXDIST_SYSROOT_CROSS)/usr/bin/python$(PYTHON3_MAJORMINOR)-config" \ + "$(PTXDIST_SYSROOT_CROSS)/usr/lib/python$(PYTHON3_MAJORMINOR)/"_sysconfigdata_m_linux_*.py # vim: syntax=make diff --git a/rules/qt5.make b/rules/qt5.make index dc5ad5f69..bdc6808b9 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -371,19 +371,19 @@ $(STATEDIR)/qt5.install.post: @find $(QT5_PKGDIR) -name '*.pri' -o -name '*.cmake' | \ xargs sed -i 's;@WORKSPACE@;$(PTXDIST_WORKSPACE);g' @$(call world/install.post, QT5) - @echo "[Paths]" > $(QT5_QT_CONF) - @echo "HostPrefix=$(SYSROOT)/usr" >> $(QT5_QT_CONF) - @echo "HostData=$(SYSROOT)/usr/lib/qt5" >> $(QT5_QT_CONF) - @echo "HostBinaries=$(PTXDIST_SYSROOT_CROSS)/bin/qt5" >> $(QT5_QT_CONF) - @echo "Prefix=/usr" >> $(QT5_QT_CONF) - @echo "Headers=$(SYSROOT)/usr/include/qt5" >> $(QT5_QT_CONF) - @echo "Libraries=$(SYSROOT)/usr/lib" >> $(QT5_QT_CONF) - @echo "Imports=/usr/lib/qt5/imports" >> $(QT5_QT_CONF) - @echo "Qml2Imports=/usr/lib/qt5/qml" >> $(QT5_QT_CONF) - @echo "" >> $(QT5_QT_CONF) + @echo "[Paths]" > $(QT5_QT_CONF) + @echo "HostPrefix=$(SYSROOT)/usr" >> $(QT5_QT_CONF) + @echo "HostData=$(SYSROOT)/usr/lib/qt5" >> $(QT5_QT_CONF) + @echo "HostBinaries=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qt5" >> $(QT5_QT_CONF) + @echo "Prefix=/usr" >> $(QT5_QT_CONF) + @echo "Headers=$(SYSROOT)/usr/include/qt5" >> $(QT5_QT_CONF) + @echo "Libraries=$(SYSROOT)/usr/lib" >> $(QT5_QT_CONF) + @echo "Imports=/usr/lib/qt5/imports" >> $(QT5_QT_CONF) + @echo "Qml2Imports=/usr/lib/qt5/qml" >> $(QT5_QT_CONF) + @echo "" >> $(QT5_QT_CONF) # # qmake is found in sysroot-cross (via PATH) and sysroot target (via cmake) - @rm -rf $(PTXDIST_SYSROOT_CROSS)/bin/qt5 - @cp -a $(SYSROOT)/usr/bin/qt5 $(PTXDIST_SYSROOT_CROSS)/bin/qt5 + @rm -rf $(PTXDIST_SYSROOT_CROSS)/usr/bin/qt5 + @cp -a $(SYSROOT)/usr/bin/qt5 $(PTXDIST_SYSROOT_CROSS)/usr/bin/qt5 @$(call touch) diff --git a/rules/qwt5.make b/rules/qwt5.make index fb7d2be58..716a38137 100644 --- a/rules/qwt5.make +++ b/rules/qwt5.make @@ -28,7 +28,7 @@ QWT5_LICENSE := LGPL-2.1-only AND QWT-1.0 # Prepare # ---------------------------------------------------------------------------- -QWT5_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/bin/qt5:$(CROSS_PATH) +QWT5_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qt5:$(CROSS_PATH) QWT5_CONF_OPT := $(CROSS_QMAKE_OPT) TARGET_TEMPLATE=lib diff --git a/rules/samba.make b/rules/samba.make index 511159292..af1d6f0eb 100644 --- a/rules/samba.make +++ b/rules/samba.make @@ -24,7 +24,7 @@ SAMBA_SOURCE := $(SRCDIR)/$(SAMBA).$(SAMBA_SUFFIX) SAMBA_DIR := $(BUILDDIR)/$(SAMBA) SAMBA_LICENSE := GPL-3.0-or-later AND LGPL-3.0-or-later # cross-compile runtime checks. Initial file generated with -# --cross-execute=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross +# --cross-execute=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross SAMBA_CONFIG = $(call ptx/get-alternative, config/samba, cross-answers) # ---------------------------------------------------------------------------- diff --git a/rules/systemd-hwdb.make b/rules/systemd-hwdb.make index 81d49ea02..875eeeba6 100644 --- a/rules/systemd-hwdb.make +++ b/rules/systemd-hwdb.make @@ -26,7 +26,7 @@ $(STATEDIR)/systemd-hwdb.install: @$(call execute, SYSTEMD_HWDB, \ ln -s $(SYSROOT)/usr/lib/udev/hwdb.d $(SYSTEMD_HWDB_PKGDIR)/usr/lib/udev/) @$(call execute, SYSTEMD_HWDB, \ - $(PTXDIST_SYSROOT_HOST)/bin/systemd-hwdb update --usr --root $(SYSTEMD_HWDB_PKGDIR)) + $(PTXDIST_SYSROOT_HOST)/usr/bin/systemd-hwdb update --usr --root $(SYSTEMD_HWDB_PKGDIR)) # # remove the link again, it conficts with the directory in sysroot @$(call execute, SYSTEMD_HWDB, \ rm $(SYSTEMD_HWDB_PKGDIR)/usr/lib/udev/hwdb.d) diff --git a/rules/talloc.make b/rules/talloc.make index 0f8d336a5..959becac6 100644 --- a/rules/talloc.make +++ b/rules/talloc.make @@ -23,7 +23,7 @@ TALLOC_SOURCE := $(SRCDIR)/$(TALLOC).$(TALLOC_SUFFIX) TALLOC_DIR := $(BUILDDIR)/$(TALLOC) TALLOC_LICENSE := GPL-3.0-or-later AND LGPL-3.0-or-later # cross-compile runtime checks. Initial file generated with -# --cross-execute=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross +# --cross-execute=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross TALLOC_CONFIG = $(call ptx/get-alternative, config/talloc, cross-answers) # ---------------------------------------------------------------------------- diff --git a/rules/templates/template-src-qmake-prog-make b/rules/templates/template-src-qmake-prog-make index 1a9d0d6f3..a86c4c44f 100644 --- a/rules/templates/template-src-qmake-prog-make +++ b/rules/templates/template-src-qmake-prog-make @@ -39,7 +39,7 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ # # qmake # -@PACKAGE@_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/bin/qt5:$(CROSS_PATH) +@PACKAGE@_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qt5:$(CROSS_PATH) @PACKAGE@_CONF_TOOL := qmake @PACKAGE@_CONF_OPT := $(CROSS_QMAKE_OPT) PREFIX=/usr diff --git a/rules/termcap.make b/rules/termcap.make index 3cc0f73b7..84c938a3e 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -32,7 +32,7 @@ TERMCAP_LICENSE := GPL-2.0-only # TERMCAP_CONF_TOOL := autoconf TERMCAP_CONF_OPT := \ - --prefix= \ + --prefix=/usr \ $(CROSS_AUTOCONF_ARCH) \ --enable-install-termcap diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index 74346807f..c683708ea 100644 --- a/rules/vulkan-loader.make +++ b/rules/vulkan-loader.make @@ -32,7 +32,7 @@ VULKAN_LOADER_CONF_TOOL := cmake VULKAN_LOADER_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \ + -DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross \ -DBUILD_TESTS=OFF \ -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make index f3114654f..57a3892bb 100644 --- a/rules/vulkan-tools.make +++ b/rules/vulkan-tools.make @@ -45,7 +45,7 @@ ifdef PTXCONF_VULKAN_TOOLS_CUBE VULKAN_TOOLS_CONF_OPT += \ -DCUBE_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_WAYLAND, WAYLAND, \ $(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_XCB, XCB, DISPLAY)) \ - -DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin + -DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/usr/bin endif # ---------------------------------------------------------------------------- diff --git a/rules/wayland.make b/rules/wayland.make index 6e1ded072..6c0de250a 100644 --- a/rules/wayland.make +++ b/rules/wayland.make @@ -29,7 +29,7 @@ WAYLAND_LICENSE := MIT WAYLAND_CONF_ENV := \ $(HOST_ENV) \ - PKG_CONFIG_FOR_BUILD=$(PTXDIST_SYSROOT_HOST)/bin/pkg-config + PKG_CONFIG_FOR_BUILD=$(PTXDIST_SYSROOT_HOST)/usr/bin/pkg-config # # meson @@ -53,8 +53,8 @@ $(STATEDIR)/wayland.install.post: # # target wayland-scanner is not needed. Make sure nobody tries to use it @rm -f $(WAYLAND_PKGDIR)/usr/bin/wayland-scanner @$(call world/install.post, WAYLAND) - @sed 's;^prefix=.*;prefix=$(PTXDIST_SYSROOT_HOST);' \ - $(PTXDIST_SYSROOT_HOST)/lib/pkgconfig/wayland-scanner.pc \ + @sed 's;^prefix=.*;prefix=$(PTXDIST_SYSROOT_HOST)/usr;' \ + $(PTXDIST_SYSROOT_HOST)/usr/lib/pkgconfig/wayland-scanner.pc \ > $(PTXDIST_SYSROOT_TARGET)/usr/lib/pkgconfig/wayland-scanner.pc @$(call touch) # ---------------------------------------------------------------------------- |