From 3688225981de4b522a1f1a407328adde0139bbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?= Date: Wed, 29 Mar 2023 20:04:11 +0200 Subject: groups/261.native_packages_x11.group:imlib2:${PKG_CPPFLAGS_CONFIGURE}: configure w/ ${NATIVE_PACKAGES_CFLAGS_CONFIGURE}. midipix.env:${DEFAULT_BUILD_VARS}: adds CPPFLAGS_CONFIGURE. etc/README.md: updated. --- etc/README.md | 1 + groups/261.native_packages_x11.group | 1 + midipix.env | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/etc/README.md b/etc/README.md index 24f90451..ba45aa6e 100644 --- a/etc/README.md +++ b/etc/README.md @@ -738,6 +738,7 @@ VERSION`` and/or ``URLS_GIT``, respectively. | CONFIGURE_ARGS_EXTRA_LIST | List(:) | Additional arguments to package (GNU autotools in implementation and/or interface) configuration script | | CONFIGURE | CmdName | Package's (GNU autotools in implementation and/or interface) configuration script | | CONFIGURE_TYPE | String | Either of ``autotools`` (GNU autotools or similar) or ``sofort`` or ``cmake`` (CMake) | +| CPPFLAGS_CONFIGURE_EXTRA | FlagLine | Additional C preprocessor flags during package (GNU autotools in implementation and/or interface) configuration | | CXX | CmdName | Toolchain C++ compiler ``c++(1)`` | | CXXFLAGS_CONFIGURE_EXTRA | FlagLine | Additional C++ compiler flags during package (GNU autotools in implementation and/or interface) configuration | | CXXFLAGS_CONFIGURE | FlagLine | C++ compiler flags during package (GNU autotools in implementation and/or interface) configuration | diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group index feefd735..3ed0a36d 100644 --- a/groups/261.native_packages_x11.group +++ b/groups/261.native_packages_x11.group @@ -49,6 +49,7 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin"; : ${PKG_IMLIB2_VERSION:=1.6.1}; : ${PKG_IMLIB2_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/imlib/imlib2-${PKG_IMLIB2_VERSION}.tar.bz2}; : ${PKG_IMLIB2_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; +: ${PKG_IMLIB2_CPPFLAGS_CONFIGURE:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE}"}; : ${PKG_IMLIB2_CONFIGURE_ARGS_EXTRA:="--disable-static --disable-mmx --disable-amd64"}; : ${PKG_IMLIB2_LIBTOOL=rdlibtool}; : ${PKG_LIBCACA_DEPENDS:="freetype ncursesw"}; diff --git a/midipix.env b/midipix.env index 51097869..8b612887 100644 --- a/midipix.env +++ b/midipix.env @@ -20,11 +20,11 @@ DEFAULT_BUILD_STEPS=" \ clean \ finish"; DEFAULT_BUILD_VARS=" \ - AR AUTOCONF_CONFIG_GUESS BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE \ - BUILD_TYPE CC CCLD CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE \ - CFLAGS_CONFIGURE_EXTRA CMAKE CMAKE_ARGS CMAKE_ARGS_EXTRA CMAKE_LISTFILE \ - CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS \ - CONFIGURE_ARGS_EXTRA CONFIGURE_ARGS_EXTRA_LIST CONFIGURE_ARGS_LIST CONFIGURE_TYPE \ + AR AUTOCONF_CONFIG_GUESS BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC CCLD \ + CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CMAKE \ + CMAKE_ARGS CMAKE_ARGS_EXTRA CMAKE_LISTFILE CONFIG_CACHE CONFIG_CACHE_EXTRA \ + CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA \ + CONFIGURE_ARGS_EXTRA_LIST CONFIGURE_ARGS_LIST CONFIGURE_TYPE CPPFLAGS_CONFIGURE \ CXX CXXFLAGS_CONFIGURE 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 \ @@ -38,7 +38,7 @@ DEFAULT_BUILD_VARS=" \ PYTHON RANLIB RPM_DISABLE SHA256SUM SOFORT_NATIVE_CC SOFORT_NATIVE_CFLAGS \ SOFORT_NATIVE_CFLAGS_EXTRA SOFORT_NATIVE_CXX SOFORT_NATIVE_CXXFLAGS \ SOFORT_NATIVE_CXXFLAGS_EXTRA SOFORT_NATIVE_LD SOFORT_NATIVE_LDFLAGS \ - SOFORT_NATIVE_LDFLAGS_EXTRA SUBDIR TARGET URL URLS_GIT VARS_FILE VERSION"; \ + SOFORT_NATIVE_LDFLAGS_EXTRA SUBDIR TARGET URL URLS_GIT VARS_FILE VERSION"; # # Prerequisite commands -- cgit v1.2.3