11 files changed, 22 insertions, 22 deletions
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 62953a1e..c3845ec5 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -2,8 +2,8 @@
 # Build group host_deps
 #
 HOST_DEPS_BUILD_TYPE="host";
-HOST_DEPS_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS_HOST}" "-I${PREFIX}/include")";
-HOST_DEPS_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS_HOST}" "-I${PREFIX}/include")";
+rtl_lconcat2 \$HOST_DEPS_CFLAGS_CONFIGURE \$DEFAULT_CFLAGS_HOST "-I${PREFIX}/include";
+rtl_lconcat2 \$HOST_DEPS_CXXFLAGS_CONFIGURE \$DEFAULT_CXXFLAGS_HOST "-I${PREFIX}/include";
 HOST_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-prefix=";
 HOST_DEPS_GROUP_DEPENDS="host_tools";
 HOST_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group
index 32c2aec7..f348dc49 100644
--- a/groups/020.host_deps_rpm.group
+++ b/groups/020.host_deps_rpm.group
@@ -2,8 +2,8 @@
 # Build group host_deps_rpm
 #
 HOST_DEPS_RPM_BUILD_TYPE="host";
-HOST_DEPS_RPM_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS_HOST}" "-I${PREFIX}/include")";
-HOST_DEPS_RPM_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS_HOST}" "-I${PREFIX}/include")";
+rtl_lconcat2 \$HOST_DEPS_RPM_CFLAGS_CONFIGURE \$DEFAULT_CFLAGS_HOST "-I${PREFIX}/include";
+rtl_lconcat2 \$HOST_DEPS_RPM_CXXFLAGS_CONFIGURE \$DEFAULT_CXXFLAGS_HOST "-I${PREFIX}/include";
 HOST_DEPS_RPM_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}";
 HOST_DEPS_RPM_GROUP_DEPENDS="host_deps host_tools";
 HOST_DEPS_RPM_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
diff --git a/groups/200.native_packages.group b/groups/200.native_packages.group
index 886fab53..d9231f6e 100644
--- a/groups/200.native_packages.group
+++ b/groups/200.native_packages.group
@@ -1,8 +1,8 @@
 #
 # Build group native_packages
 #
-NATIVE_PACKAGES_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS}" "--sysroot=${PREFIX_NATIVE}")";
-NATIVE_PACKAGES_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS}" "--sysroot=${PREFIX_NATIVE}")";
+rtl_lconcat2 \$NATIVE_PACKAGES_CFLAGS_CONFIGURE \$DEFAULT_CFLAGS "--sysroot=${PREFIX_NATIVE}";
+rtl_lconcat2 \$NATIVE_PACKAGES_CXXFLAGS_CONFIGURE \$DEFAULT_CFLAGS "--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
 NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
 NATIVE_PACKAGES_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools native_toolchain native_tools";
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 6f29fd1e..aa121ab1 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -2,11 +2,11 @@
 # Build group native_packages (cmdline)
 #
 GROUP_TARGET="native_packages";
-NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
+rtl_lconcat \$NATIVE_PACKAGES_PACKAGES "
 bas bash bc busybox cabextract calcurse clipboard_utils coreutils cpio dash datamash dos2unix ed exif figlet
 findutils gawk gcal grep html_xml_utils jush lzop mawk mc mksh moe moon_buggy mpg123 mp3splt nano ninvaders
 openbsd_baseutils profanity pixz pv rc sash sbase screen sed sharutils sloccount tar tcsh
-the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
+the_silver_searcher toilet tree terminally_tetris ubase which zsh";
 : ${PKG_BAS_DEPENDS:="ncurses"};
 : ${PKG_BAS_SHA256SUM:=ec45efa90aaa7f15647fe7898fa0789ba26dc8e10b7ecf8e049b1310f626b884};
 : ${PKG_BAS_VERSION:=2.6};
diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index fcde0b3b..6694a00e 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -2,9 +2,9 @@
 # Build group native_packages (dev)
 #
 GROUP_TARGET="native_packages";
-NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
+rtl_lconcat \$NATIVE_PACKAGES_PACKAGES "
 bison cdecl chicken cparser cssc diffutils flex gdb gengetopt gnucobol indent lua lunix m4 make mandoc nasm
-patch patchutils perl posix_cc python2 python3 ruby sbsigntools tk")";
+patch patchutils perl posix_cc python2 python3 ruby sbsigntools tk";
 : ${PKG_BISON_DEPENDS:="readline libiconv"};
 : ${PKG_BISON_SHA256SUM:=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2};
 : ${PKG_BISON_VERSION:=3.8.2};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 7534c226..1ca72ec2 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -2,7 +2,7 @@
 # Build group native_packages (etc)
 #
 GROUP_TARGET="native_packages";
-NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
+rtl_lconcat \$NATIVE_PACKAGES_PACKAGES "
 apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante
 dosbox doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl
 giflib gnuchess graphicsmagick gzip hastyhex hexcurse hexer icoutils imagemagick infounzip infozip
@@ -10,7 +10,7 @@ john lbreakout2 lcms2 less libmetalink lolcode ltris minizip mintty mlogin musl_
 ncurses ncursestw ncursesw npth openjazz openjpeg p7zip pcre pcre2 php popt potrace procps_ng qemu
 qpdf qrencode rpm rw sdlquake shared_mime_info slang sqlite3 tcl tdnf texinfo
 tiff tmux tzdb utf8proc util_linux vim vorbis_tools w32api w32lib xorriso xpdf xz yabasic
-zstd")";
+zstd";
 : ${PKG_APR_SHA256SUM:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105};
 : ${PKG_APR_VERSION:=1.6.5};
 : ${PKG_APR_URL:=http://ftp.fau.de/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 32a9445c..d96fa2ac 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -2,11 +2,11 @@
 # Build group native_packages (inet)
 #
 GROUP_TARGET="native_packages";
-NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
+rtl_lconcat \$NATIVE_PACKAGES_PACKAGES "
 apk_tools bind ca_certificates curl cvs dropbear elinks fetchmail git gnupg gpgme
 gnutls httpd icecast inetutils irssi isync ldns lighttpd links lynx mailutils
 microsocks mutt nginx ngircd nullmailer openlitespeed opensmtpd openssh
-proxytunnel rsync socat thttpd w3m weechat wget wget2 whois")";
+proxytunnel rsync socat thttpd w3m weechat wget wget2 whois";
 : ${PKG_APK_TOOLS_DEPENDS:="libfetch libressl libz"};
 : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
 : ${PKG_APK_TOOLS_VERSION:=2.6.8};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index c97d338a..05b2053c 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -2,14 +2,14 @@
 # Build group native_packages (libs)
 #
 GROUP_TARGET="native_packages";
-NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
+rtl_lconcat \$NATIVE_PACKAGES_PACKAGES "
 aspell bearssl enchant fribidi glib hunspell ivykis jansson kvazaar lame libao libarchive libass libassuan libatomic_ops libdmtx libedit libeditline libelf libestr
 libevent libexif libfastjson libfetch libffi libfirm libflac libglob libgcrypt libgpg_error libiconv libidn2 libite
 libjpeg_turbo libksba libmad libmd libmspack libmp3splt libogg libpcap libpng libpsl
 readline libredwg libressl libsasl2 libshine libsndfile libsolv libssh
 libstrophe libtasn1 libtelnet libtheora libtirpc libudns libunistring
 libuv libvorbis libxml2 libxslt libz libzip lzlib lzo nettle onig opus sdl1 sdl1_net sdl1_mixer
-sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf sdl2_net twolame wolfssl")";
+sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf sdl2_net twolame wolfssl";
 : ${PKG_ASPELL_SHA256SUM:=f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2};
 : ${PKG_ASPELL_VERSION:=0.60.8};
 : ${PKG_ASPELL_URL:=https://ftp.gnu.org/gnu/aspell/aspell-${PKG_ASPELL_VERSION}.tar.gz};
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index 5636113d..eb62afcc 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -2,13 +2,13 @@
 # Build group native_packages (x11)
 #
 GROUP_TARGET="native_packages";
-NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
+rtl_lconcat \$NATIVE_PACKAGES_PACKAGES "
 cairo fontconfig freetype freetype_pre gxemul harfbuzz imlib2
 libcaca libfontenc libICE libpthread_stubs libSM libX11 libXau
 libXaw libXdamage libXdmcp libXext libXfixes libXfont2 libXft libXi libxkbfile
 libXmu libXpm libXt libXtst libXcursor pango pixman rdesktop rxvt_unicode
 st util_macros xcb xcb_proto xcb_util xcb_util_image xcb_util_wm xcalc
-xeyes xorgproto Xrender xterm xtrans xwd xwin")";
+xeyes xorgproto Xrender xterm xtrans xwd xwin";
 : ${PKG_CAIRO_DEPENDS:="fontconfig freetype ghostpdl glib libXext libpng pixman"};
 : ${PKG_CAIRO_VERSION:=1.15.6};
 : ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz};
diff --git a/groups/800.minipix.group b/groups/800.minipix.group
index f5db9617..43f6d2ee 100644
--- a/groups/800.minipix.group
+++ b/groups/800.minipix.group
@@ -1,8 +1,8 @@
 #
 # Build group minipix
 #
-MINIPIX_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS}" "--sysroot=${PREFIX_NATIVE}")";
-MINIPIX_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS}" "--sysroot=${PREFIX_NATIVE}")";
+rtl_lconcat2 \$MINIPIX_CFLAGS_CONFIGURE \$DEFAULT_CFLAGS "--sysroot=${PREFIX_NATIVE}";
+rtl_lconcat2 \$MINIPIX_CXXFLAGS_CONFIGURE \$DEFAULT_CXXFLAGS "--sysroot=${PREFIX_NATIVE}";
 MINIPIX_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
 MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
 MINIPIX_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools native_packages native_toolchain native_tools";
diff --git a/groups/dev_packages.group b/groups/dev_packages.group
index fc9e4060..a141a7ad 100644
--- a/groups/dev_packages.group
+++ b/groups/dev_packages.group
@@ -2,8 +2,8 @@
 # Build group dev_packages
 #
 GROUP_AUTO=0;
-DEV_PACKAGES_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS}" "--sysroot=${PREFIX_NATIVE}")";
-DEV_PACKAGES_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS}" "--sysroot=${PREFIX_NATIVE}")";
+rtl_lconcat2 \$DEV_PACKAGES_CFLAGS_CONFIGURE \$DEFAULT_CFLAGS "--sysroot=${PREFIX_NATIVE}";
+rtl_lconcat2 \$DEV_PACKAGES_CXXFLAGS_CONFIGURE \$DEFAULT_CXXFLAGS "--sysroot=${PREFIX_NATIVE}";
 DEV_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
 DEV_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
 DEV_PACKAGES_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools native_toolchain native_tools";