From 2e5c2f023959cd4dfd496256e945c68ce9fcb345 Mon Sep 17 00:00:00 2001 From: CvH Date: Thu, 23 Aug 2018 22:48:50 +0200 Subject: [PATCH 1/3] chrome: change lib paths --- packages/addons/browser/chrome/package.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index ad706b4ce7..df7d2382cd 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -65,31 +65,31 @@ addon() { cp -PL $(get_build_dir cups)/cups/libcups.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib # libxcb - cp -PL $(get_build_dir chrome-libxcb)/.install_pkg/usr/lib/libxcb.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir chrome-libxcb)/.$TARGET_NAME/src/.libs/libxcb.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXcomposite - cp -PL $(get_build_dir chrome-libXcomposite)/.install_pkg/usr/lib/libXcomposite.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir chrome-libXcomposite)/.$TARGET_NAME/src/.libs/libXcomposite.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXcursor cp -PL $(get_build_dir libXcursor)/.install_pkg/usr/lib/libXcursor.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXdamage - cp -PL $(get_build_dir chrome-libXdamage)/.install_pkg/usr/lib/libXdamage.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir chrome-libXdamage)/.$TARGET_NAME/src/.libs/libXdamage.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXfixes - cp -PL $(get_build_dir chrome-libXfixes)/.install_pkg/usr/lib/libXfixes.so.3 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir chrome-libXfixes)/.$TARGET_NAME/src/.libs/libXfixes.so.3 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXi - cp -PL $(get_build_dir chrome-libXi)/.install_pkg/usr/lib/libXi.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir chrome-libXi)/.$TARGET_NAME/src/.libs/libXi.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXrender - cp -PL $(get_build_dir chrome-libXrender)/.install_pkg/usr/lib/libXrender.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir chrome-libXrender)/.$TARGET_NAME/src/.libs/libXrender.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libxss cp -PL $(get_build_dir libxss)/.install_pkg/usr/lib/libXss.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXtst - cp -PL $(get_build_dir chrome-libXtst)/.install_pkg/usr/lib/libXtst.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir chrome-libXtst)/.$TARGET_NAME/src/.libs/libXtst.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib # pango cp -PL $(get_build_dir pango)/.install_pkg/usr/lib/libpangocairo-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib From 8185d44a8a15d178298639f7d74fdc985cea6c26 Mon Sep 17 00:00:00 2001 From: CvH Date: Thu, 23 Aug 2018 22:49:03 +0200 Subject: [PATCH 2/3] chrome-libs: don't copy to toolchain --- .../chrome-depends/chrome-libXcomposite/package.mk | 4 ++++ .../addon-depends/chrome-depends/chrome-libXdamage/package.mk | 4 ++++ .../addon-depends/chrome-depends/chrome-libXfixes/package.mk | 4 ++++ .../addon-depends/chrome-depends/chrome-libXi/package.mk | 4 ++++ .../addon-depends/chrome-depends/chrome-libXrender/package.mk | 4 ++++ .../addon-depends/chrome-depends/chrome-libXtst/package.mk | 4 ++++ .../addon-depends/chrome-depends/chrome-libxcb/package.mk | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk index 2d031136d1..724a527e4f 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk @@ -15,3 +15,7 @@ unpack() { PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ --disable-static \ --enable-shared" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk index 7fe4ba922e..477eb2806f 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk @@ -15,3 +15,7 @@ unpack() { PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ --disable-static \ --enable-shared" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk index c92e88f782..91bb174ea0 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk @@ -15,3 +15,7 @@ unpack() { PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ --disable-static \ --enable-shared" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk index 57c9f047cb..6353223655 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk @@ -15,3 +15,7 @@ unpack() { PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ --disable-static \ --enable-shared" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk index 2b54b0e0b9..ad5bb175f6 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk @@ -15,3 +15,7 @@ unpack() { PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ --disable-static \ --enable-shared" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk index 796b63a0b6..b0f2390b66 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk @@ -15,3 +15,7 @@ unpack() { PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ --disable-static \ --enable-shared" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk index 416c2c623d..1f4efebfeb 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk @@ -15,3 +15,7 @@ unpack() { PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ --disable-static \ --enable-shared" + +makeinstall_target() { + : +} From fae9504387c9752f4337e9a30ebc7aa20ae1f1fc Mon Sep 17 00:00:00 2001 From: CvH Date: Fri, 24 Aug 2018 09:26:34 +0200 Subject: [PATCH 3/3] chrome-deps: don't copy to toolchain --- .../chrome-depends/gdk-pixbuf/package.mk | 3 +++ .../chrome-depends/gtk3/package.mk | 6 +++++ .../chrome-depends/libXScrnSaver/package.mk | 4 ++++ .../chrome-depends/libXcursor/package.mk | 4 ++++ .../chrome-depends/libXft/package.mk | 4 ++++ .../chrome-depends/libxss/package.mk | 4 ++++ .../chrome-depends/pango/package.mk | 8 +++++++ .../chrome-depends/scrnsaverproto/package.mk | 4 ++++ .../shared-mime-info/package.mk | 4 ++++ packages/addons/browser/chrome/package.mk | 24 +++++++++---------- 10 files changed, 53 insertions(+), 12 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk index 73c34b1fa4..54d152ae8d 100644 --- a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk @@ -16,3 +16,6 @@ PKG_MESON_OPTS_TARGET="-Ddocs=false \ -Dgir=false \ -Dman=false \ -Drelocatable=false" +pre_configure_target() { + export PKG_CONFIG_PATH="$(get_build_dir shared-mime-info)/.$TARGET_NAME" +} diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk index ea26b468a0..eb96587a80 100644 --- a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk @@ -27,4 +27,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-cups \ pre_configure_target() { LIBS="$LIBS -lXcursor" + export PKG_CONFIG_PATH="$(get_build_dir pango)/.$TARGET_NAME" + export CFLAGS="$CFLAGS -I$(get_build_dir pango) -L$(get_build_dir pango)/.$TARGET_NAME/pango" +} + +makeinstall_target() { + : } diff --git a/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk b/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk index 75718f5e9e..2b283e74f8 100644 --- a/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk @@ -15,3 +15,7 @@ PKG_LONGDESC="X11 Screen Saver extension client library" PKG_CONFIGURE_OPTS_TARGET="--disable-static \ --enable-shared \ --enable-malloc0returnsnull" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk index b17e9424ab..681d8cb4a0 100644 --- a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk @@ -12,3 +12,7 @@ PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-$PKG_VER PKG_DEPENDS_TARGET="toolchain libX11 libXfixes libXrender" PKG_LONGDESC="X11 Cursor management library" PKG_BUILD_FLAGS="+pic" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/libXft/package.mk b/packages/addons/addon-depends/chrome-depends/libXft/package.mk index 3573a1ebfd..f475292167 100644 --- a/packages/addons/addon-depends/chrome-depends/libXft/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libXft/package.mk @@ -15,3 +15,7 @@ PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-shared" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/libxss/package.mk b/packages/addons/addon-depends/chrome-depends/libxss/package.mk index 4255a68f5b..27a564a49c 100644 --- a/packages/addons/addon-depends/chrome-depends/libxss/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libxss/package.mk @@ -14,3 +14,7 @@ PKG_LONGDESC="X11 Screen Saver extension library" PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/pango/package.mk b/packages/addons/addon-depends/chrome-depends/pango/package.mk index 9c17d2f6a0..6a72e8559b 100644 --- a/packages/addons/addon-depends/chrome-depends/pango/package.mk +++ b/packages/addons/addon-depends/chrome-depends/pango/package.mk @@ -15,3 +15,11 @@ PKG_TOOLCHAIN="meson" PKG_MESON_OPTS_TARGET="-Denable_docs=false \ -Dgir=false" + +pre_configure_target() { + export PKG_CONFIG_PATH="$(get_build_dir cairo)/.$TARGET_NAME/src":"$(get_build_dir libXft)/.$TARGET_NAME/src" +} + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk b/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk index 6d0b9a3d7a..6bd52d6907 100644 --- a/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk +++ b/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk @@ -11,3 +11,7 @@ PKG_SITE="http://xorg.freedesktop.org/" PKG_URL="https://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="X11 Screen Saver extension wire protocol" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/chrome-depends/shared-mime-info/package.mk b/packages/addons/addon-depends/chrome-depends/shared-mime-info/package.mk index 94faef198a..4bff8dd2f6 100644 --- a/packages/addons/addon-depends/chrome-depends/shared-mime-info/package.mk +++ b/packages/addons/addon-depends/chrome-depends/shared-mime-info/package.mk @@ -14,3 +14,7 @@ PKG_BUILD_FLAGS="-parallel" PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ --disable-update-mimedb" + +makeinstall_target() { + : +} diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index df7d2382cd..73126a22da 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -35,7 +35,7 @@ addon() { cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config # atk - cp -PL $(get_build_dir atk)/.install_pkg/usr/lib/libatk-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir atk)/.$TARGET_NAME/atk/libatk-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib # cairo cp -PL $(get_build_dir cairo)/.install_pkg/usr/lib/libcairo-gobject.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib @@ -48,18 +48,18 @@ addon() { cp -PL $(get_build_dir gdk-pixbuf)/.install_pkg/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules # gtk3 gdk3 - cp -PL $(get_build_dir gtk3)/.install_pkg/usr/lib/libgtk-3.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PL $(get_build_dir gtk3)/.install_pkg/usr/lib/libgdk-3.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir gtk3)/.$TARGET_NAME/gtk/.libs/libgtk-3.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir gtk3)/.$TARGET_NAME/gdk/.libs/libgdk-3.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib # harfbuzz - cp -PL $(get_build_dir harfbuzz)/.install_pkg/usr/lib/libharfbuzz.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PL $(get_build_dir harfbuzz)/.install_pkg/usr/lib/libharfbuzz-icu.so* $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir harfbuzz)/.$TARGET_NAME/src/.libs/libharfbuzz.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir harfbuzz)/.$TARGET_NAME/src/.libs/libharfbuzz-icu.so* $ADDON_BUILD/$PKG_ADDON_ID/lib # libatk-bridge - cp -PL $(get_build_dir at-spi2-atk)/.install_pkg/usr/lib/libatk-bridge-2.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir at-spi2-atk)/.$TARGET_NAME/atk-adaptor/libatk-bridge-2.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib # libatspi - cp -PL $(get_build_dir at-spi2-core)/.install_pkg/usr/lib/libatspi.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir at-spi2-core)/.$TARGET_NAME/atspi/libatspi.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib # libcups cp -PL $(get_build_dir cups)/cups/libcups.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib @@ -71,7 +71,7 @@ addon() { cp -PL $(get_build_dir chrome-libXcomposite)/.$TARGET_NAME/src/.libs/libXcomposite.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXcursor - cp -PL $(get_build_dir libXcursor)/.install_pkg/usr/lib/libXcursor.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir libXcursor)/.$TARGET_NAME/src/.libs/libXcursor.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXdamage cp -PL $(get_build_dir chrome-libXdamage)/.$TARGET_NAME/src/.libs/libXdamage.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib @@ -86,15 +86,15 @@ addon() { cp -PL $(get_build_dir chrome-libXrender)/.$TARGET_NAME/src/.libs/libXrender.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libxss - cp -PL $(get_build_dir libxss)/.install_pkg/usr/lib/libXss.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir libxss)/.$TARGET_NAME/src/.libs/libXss.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib # libXtst cp -PL $(get_build_dir chrome-libXtst)/.$TARGET_NAME/src/.libs/libXtst.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib # pango - cp -PL $(get_build_dir pango)/.install_pkg/usr/lib/libpangocairo-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PL $(get_build_dir pango)/.install_pkg/usr/lib/libpango-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PL $(get_build_dir pango)/.install_pkg/usr/lib/libpangoft2-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir pango)/.$TARGET_NAME/pango/libpangocairo-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir pango)/.$TARGET_NAME/pango/libpango-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_build_dir pango)/.$TARGET_NAME/pango/libpangoft2-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib # unclutter cp -P $(get_build_dir unclutter)/.install_pkg/usr/bin/unclutter $ADDON_BUILD/$PKG_ADDON_ID/bin