From 45117a354a0c09c4f200ab1a28309a147cdc1a98 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 25 Apr 2025 23:25:19 +0000 Subject: [PATCH 1/2] st: fix include and lib make options --- .../addons/addon-depends/system-tools-depends/st/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/st/package.mk b/packages/addons/addon-depends/system-tools-depends/st/package.mk index 9631d03066..c9f0f0264a 100644 --- a/packages/addons/addon-depends/system-tools-depends/st/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/st/package.mk @@ -12,8 +12,8 @@ PKG_DEPENDS_TARGET="toolchain libX11 libXft libXrender fontconfig freetype ncurs PKG_LONGDESC="A simple terminal implementation for X" PKG_BUILD_FLAGS="-sysroot" -PKG_MAKE_OPTS_TARGET="X11INC=$(get_build_dir libXft)/include \ - X11LIB=$(get_build_dir libXft)/.${TARGET_NAME}/src/.libs" +PKG_MAKE_OPTS_TARGET="X11INC=$(get_install_dir libXft)/usr/include \ + X11LIB=$(get_install_dir libXft)/usr/lib" pre_configure_target() { LDFLAGS="-lXrender ${LDFLAGS}" From cbcb2a4a9790427244350a1a1f1ba6764a7d6925 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 25 Apr 2025 23:27:00 +0000 Subject: [PATCH 2/2] libXft: relocate to addon-depends as it is used by both chrome and st --- .../addons/addon-depends/{chrome-depends => }/libXft/package.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/addons/addon-depends/{chrome-depends => }/libXft/package.mk (100%) diff --git a/packages/addons/addon-depends/chrome-depends/libXft/package.mk b/packages/addons/addon-depends/libXft/package.mk similarity index 100% rename from packages/addons/addon-depends/chrome-depends/libXft/package.mk rename to packages/addons/addon-depends/libXft/package.mk