From d2af823afe6912649b4d09e26fd2690b992255ee Mon Sep 17 00:00:00 2001 From: LucĂ­a Andrea Illanes Albornoz Date: Dec 27 2022 06:14:34 +0000 Subject: groups/231.native_packages_etc.group:gettext_tiny:${PKG_DEPENDS}: adds libiconv. groups/231.native_packages_etc.group:gettext_tiny:${PKG_CFLAGS_BUILD}: build w/ ${NATIVE_PACKAGES_CFLAGS_CONFIGURE}. groups/231.native_packages_etc.group:gettext_tiny:${PKG_LDFLAGS_BUILD}: build w/ ${NATIVE_PACKAGES_LDFLAGS_CONFIGURE:+${NATIVE_PACKAGES_CFLAGS_CONFIGURE} }-liconv. midipix.env:${DEFAULT_BUILD_VARS}: adds LDFLAGS_BUILD. --- diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 0568150..40aed6c 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -160,11 +160,13 @@ zstd")"; : ${PKG_GEOIP_SHA256SUM:=0daf0dbe35249f0affb5e10010e0b6b8104d19e156ab8e3b2318df8165463f21}; : ${PKG_GEOIP_VERSION:=1.7.0}; : ${PKG_GEOIP_URL:=https://midipix.org/mirror/geoip/geoip-api-c-${PKG_GEOIP_VERSION}.tar.gz}; +: ${PKG_GETTEXT_TINY_DEPENDS:="libiconv"}; : ${PKG_GETTEXT_TINY_SHA256SUM:=29cc165e27e83d2bb3760118c2368eadab550830d962d758e51bd36eb860f383}; : ${PKG_GETTEXT_TINY_VERSION:=0.3.2}; : ${PKG_GETTEXT_TINY_URL:=https://toolchains.bootlin.com/downloads/releases/sources/gettext-tiny-${PKG_GETTEXT_TINY_VERSION}/gettext-tiny-${PKG_GETTEXT_TINY_VERSION}.tar.gz}; : ${PKG_GETTEXT_TINY_BUILD_DIR:=gettext-tiny-${PKG_GETTEXT_TINY_VERSION}}; -: ${PKG_GETTEXT_TINY_CFLAGS_BUILD_EXTRA:="-DLIBICONV_PLUG"}; +: ${PKG_GETTEXT_TINY_CFLAGS_BUILD:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE}"}; +: ${PKG_GETTEXT_TINY_LDFLAGS_BUILD:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE:+${NATIVE_PACKAGES_CFLAGS_CONFIGURE} }-liconv"}; : ${PKG_GHOSTPDL_DEPENDS:="libpng tiff fontconfig libz libXt libX11 freetype expat openjpeg"}; : ${PKG_GHOSTPDL_SHA256SUM:=9059bf9c0685e88206d34b702f5a15f148451959f73ab2d01d44a5b12088a762}; : ${PKG_GHOSTPDL_VERSION:=9.52}; diff --git a/midipix.env b/midipix.env index dfb6ddf..e89c172 100644 --- a/midipix.env +++ b/midipix.env @@ -26,7 +26,7 @@ DEFAULT_BUILD_VARS=" \ CXXFLAGS_CONFIGURE_EXTRA DEPENDS DESTDIR DESTDIR_HOST DISABLED \ ENV_VARS_EXTRA FNAME FORCE_AUTORECONF GITROOT INHERIT_FROM INSTALL_FILES \ INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_FILES_V2 \ - INSTALL_TARGET INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA \ + INSTALL_TARGET INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD LDFLAGS_BUILD_EXTRA \ LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKEFLAGS_BUILD \ MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA \ MAKEFLAGS_VERBOSITY MAKE_INSTALL_VNAME MAKE_SUBDIRS MIRRORS MIRRORS_GIT \