From f246485bf244cb770dfd57f48098af75faea552e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Tue, 24 Aug 2021 23:17:20 +0200 Subject: Merge {groups,vars}/ w/ extended ${PKG_INSTALL_V2} DSL. files/{autoconf_2_64_host,busybox,install_strip_host,libxml2,pkgconf,{pkgconf,python2,rpm,texinfo}_host}/*, etc/{busyboxconfig,python2.7-config}: added/moved. groups/000.host_tools.group:auto{conf_2_64,make_1_11_6}_host:${PKG_INSTALL_FILES_V2}: merged. groups/000.host_tools.group:install_strip_host:${PKG_BUILD_STEPS_DISABLE}: disable "build install_make install_rpm". groups/000.host_tools.group:install_strip_host:${PKG_INSTALL_FILES_V2}: merged. groups/000.host_tools.group:pkgconf_host:${PKG_INSTALL_FILES_V2}: merged. groups/010.host_deps.group:chainport_host:${PKG_BUILD_STEPS_DISABLE}: disable "build install_make install_rpm". groups/010.host_deps.group:chainport_host:${PKG_PREFIX}: removed. groups/010.host_deps.group:{chainport,clzip,cmake,dbus,libffi,libzip,mdso,ncursesw,perk,python[23],texinfo,tzdb}_host:${PKG_INSTALL_FILES_V2}: merged/updated. groups/020.host_deps_rpm.group:rpm_host:${PKG_INSTALL_FILES_V2}: merged. groups/030.host_toolchain.group:{binutils,ldso,nasm}_host:${PKG_INSTALL_FILES_V2}: merged/updated. groups/100.native_tools.group:{mdso,perk,pkgconf}:${PKG_INSTALL_FILES_V2}: merged. groups/110.native_toolchain.group:binutils:${PKG_INSTALL_FILES_V2}: merged. groups/120.native_runtime.group:{ldso,ntux,psxscl_strace}:${PKG_INSTALL_FILES_V2}: updated. groups/211.native_packages_cmdline.group:{busybox,dash.dos2unix,mksh,ninvaders,openbsd_baseutils,pixz,tree,terminally_tetris}:${PKG_INSTALL_FILES_V2}: merged/updated. groups/221.native_packages_dev.group:{gdb,lua,python3}:${PKG_INSTALL_FILES_V2}: updated. groups/231.native_packages_etc.group:{apr_util,bochs,bzip2,clzip,doomgeneric,hastyhex,john,ncursesw,p7zip,vim}:${PKG_INSTALL_FILES_V2}: updated. groups/251.native_packages_lib.group:{lib{ffi,jpeg_turbo,solv,ssh,xml2,zip},nettle,wolfssl}:${PKG_INSTALL_FILES_V2}: merged/updated. groups/251.native_packages_lib.group:nettle:${PKG_CONFIG_CACHE_EXTRA}: merged. groups/261.native_packages_x11.group:{glew,st}:${PKG_INSTALL_FILES_V2}: updated. groups/800.minipix.group:{bash,bzip2,dash,dropbear}_minipix:${PKG_INSTALL_FILES_V2}: updated. vars/{{autoconf_2_64,automake_1_11_6,chainport,dbus,install_strip,nasm,pkgconf,rpm,texinfo,tzdb}_host,nettle,pkgconf{,_host}}.vars: deleted. --- groups/120.native_runtime.group | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'groups/120.native_runtime.group') diff --git a/groups/120.native_runtime.group b/groups/120.native_runtime.group index 07364f21..2fe70f2a 100644 --- a/groups/120.native_runtime.group +++ b/groups/120.native_runtime.group @@ -17,7 +17,9 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LDSO_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine}; : ${PKG_LDSO_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO"}; : ${PKG_LDSO_CONFIGURE_ARGS_EXTRA:=--disable-shared}; -: ${PKG_LDSO_INSTALL_FILES:="/=${DEFAULT_TARGET}/lib @../../lib/libldso.a=${DEFAULT_TARGET}/lib/libldso.a"}; +: ${PKG_LDSO_INSTALL_FILES_V2:=" + /=${DEFAULT_TARGET}/lib + @../../lib/libldso.a=${DEFAULT_TARGET}/lib/libldso.a"}; : ${PKG_LDSO_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a}; : ${PKG_LDSO_MAKEFLAGS_INSTALL_EXTRA:=STATIC_LIB_NAME=libldso.a}; : ${PKG_NTAPI_DEPENDS:="dalist ldso pemagine psxtypes"}; @@ -33,7 +35,7 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_NTUX_DEPENDS:="dalist ldso ntapi pemagine psxscl"}; : ${PKG_NTUX_URLS_GIT:=ntux=${DEFAULT_GITROOT}/ntux}; : ${PKG_NTUX_CFLAGS_CONFIGURE_EXTRA:=-O0}; -: ${PKG_NTUX_HOST_INSTALL_FILES:="ntux/bin/ntux=bin/ntux"}; +: ${PKG_NTUX_HOST_INSTALL_FILES_V2:="+ntux/bin/ntux=bin/%[FNAME]"}; : ${PKG_PEMAGINE_DEPENDS:="ldso psxtypes"}; : ${PKG_PEMAGINE_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine}; : ${PKG_PEMAGINE_CFLAGS_CONFIGURE_EXTRA:=-O0}; @@ -47,7 +49,9 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PSXSCL_STRACE_URLS_GIT:=psxscl=${DEFAULT_GITROOT_HEAD}/psxscl}; : ${PKG_PSXSCL_STRACE_BUILD_STEPS_DISABLE:=install_make}; : ${PKG_PSXSCL_STRACE_CFLAGS_CONFIGURE_EXTRA:="-DPSX_EXTENDED_STRACE -O0"}; -: ${PKG_PSXSCL_STRACE_INSTALL_FILES:="/=lib/debug ../obj/lib/libpsxscl.so=lib/debug/"}; +: ${PKG_PSXSCL_STRACE_INSTALL_FILES_V2:=" + /=lib/debug + +../obj/lib/libpsxscl.so=lib/debug/%[FNAME]"}; : ${PKG_PSXSCL_STRACE_MIRRORS_GIT:="skip"}; : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes}; : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"}; -- cgit v1.2.3