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/251.native_packages_lib.group | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'groups/251.native_packages_lib.group') diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 65c3e7eb..365771cc 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -83,7 +83,9 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")"; : ${PKG_LIBFFI_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz}; : ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64}; : ${PKG_LIBFFI_ENV_VARS_EXTRA:="MAKE=make LIBTOOL=slibtool"}; -: ${PKG_LIBFFI_INSTALL_FILES:="lib/libffi-${PKG_LIBFFI_VERSION}/include/ffi.h=include/ffi.h lib/libffi-${PKG_LIBFFI_VERSION}/include/ffitarget.h=include/ffitarget.h"}; +: ${PKG_LIBFFI_INSTALL_FILES_V2:=" + +lib/libffi-${PKG_LIBFFI_VERSION}/include/ffi.h=include/%[FNAME] + +lib/libffi-${PKG_LIBFFI_VERSION}/include/ffitarget.h=include/%[FNAME]"}; : ${PKG_LIBFFI_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libffi/libffi-${PKG_LIBFFI_VERSION}.midipix.patch"}; : ${PKG_LIBFIRM_URLS_GIT:="libfirm=http://pp.info.uni-karlsruhe.de/git/libfirm.git@master bfirm=${DEFAULT_GITROOT}/compilers/bfirm@main"}; : ${PKG_LIBFIRM_BASE_DIR:=${BUILD_WORKDIR}/cparser+libfirm-native-${DEFAULT_TARGET}}; @@ -121,8 +123,7 @@ gcry_cv_visibility_attribute=yes"}; -DCMAKE_ASM_NASM_COMPILER=${PREFIX}/bin/${DEFAULT_TARGET}-nasm -DCMAKE_ASM_NASM_OBJECT_FORMAT=win64 -DWITH_SIMD=OFF - -DWITH_JPEG8=ON -"}; + -DWITH_JPEG8=ON"}; : ${PKG_LIBKSBA_DEPENDS:="libgpg_error"}; : ${PKG_LIBKSBA_SHA256SUM:=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b}; : ${PKG_LIBKSBA_VERSION:=1.6.0}; @@ -212,8 +213,7 @@ ksba_cv_visibility_attribute=yes"}; -DRPMIO_LIBRARY=${PREFIX_NATIVE}/lib/librpmio.so -DWITH_LIBXML2:BOOL=ON -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include - -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a -"}; + -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a"}; : ${PKG_LIBSSH_DEPENDS:="libz"}; : ${PKG_LIBSSH_SHA256SUM:=acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718}; : ${PKG_LIBSSH_VERSION:=0.9.5}; @@ -224,9 +224,7 @@ ksba_cv_visibility_attribute=yes"}; -DWITH_GCRYPT=ON -DWITH_SYMBOL_VERSIONING=OFF -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include - -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.lib.a - -"}; + -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.lib.a"}; : ${PKG_LIBSTROPHE_DEPENDS:="libressl expat"}; : ${PKG_LIBSTROPHE_SHA256SUM:=cf1a363ae6df88ccd97292d4e859b7680d8bac79347b53a9dc8f095456b7a02d}; : ${PKG_LIBSTROPHE_VERSION=0.10.1}; @@ -268,6 +266,9 @@ ksba_cv_visibility_attribute=yes"}; : ${PKG_LIBXML2_VERSION:=2.9.10}; : ${PKG_LIBXML2_URL:=ftp://xmlsoft.org/libxml2/libxml2-${PKG_LIBXML2_VERSION}.tar.gz}; : ${PKG_LIBXML2_CONFIGURE_ARGS_EXTRA:="--with-python=no"}; +: ${PKG_LIBXML2_INSTALL_FILES_V2:=" + +%[_files]/bin/\%[_target]-xml2-config=bin/%[_target]-xml2-config + m0755=bin/%[_target]-xml2-config"}; : ${PKG_LIBXSLT_DEPENDS:="libxml2 libgcrypt"}; : ${PKG_LIBXSLT_SHA256SUM:=98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f}; : ${PKG_LIBXSLT_VERSION:=1.1.34}; @@ -297,8 +298,7 @@ ksba_cv_visibility_attribute=yes"}; -DOPENSSL_CRYPTO_LIBRARY=${PREFIX_NATIVE}/lib/libcrypto.lib.a -DOPENSSL_SSL_LIBRARY=${PREFIX_NATIVE}/lib/libssl.lib.a -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include - -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a -"}; + -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a"}; : ${PKG_LZO_SHA256SUM:=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072}; : ${PKG_LZO_VERSION:=2.10}; : ${PKG_LZO_URL:=https://www.oberhumer.com/opensource/lzo/download/lzo-${PKG_LZO_VERSION}.tar.gz}; @@ -307,6 +307,8 @@ ksba_cv_visibility_attribute=yes"}; : ${PKG_NETTLE_URL:=https://ftp.gnu.org/gnu/nettle/nettle-${PKG_NETTLE_VERSION}.tar.gz}; : ${PKG_NETTLE_CONFIGURE_ARGS_EXTRA:=--disable-fat}; : ${PKG_NETTLE_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99}; +: ${PKG_NETTLE_CONFIG_CACHE_EXTRA:="nettle_cv_asm_underscore=no"}; +: ${PKG_NETTLE_INSTALL_FILES_V2:="m0755=lib/%"}; : ${PKG_NETTLE_MAKEFLAGS_BUILD:=-j1}; : ${PKG_READLINE_DEPENDS:="ncurses ncursestw ncursesw"}; : ${PKG_READLINE_SHA256SUM:=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02}; @@ -374,6 +376,8 @@ ksba_cv_visibility_attribute=yes"}; : ${PKG_WOLFSSL_URL:=https://github.com/wolfSSL/wolfssl/archive/v${PKG_WOLFSSL_VERSION}-stable.tar.gz}; : ${PKG_WOLFSSL_CONFIGURE_ARGS_EXTRA:="--enable-distro --with-libz=${PREFIX_NATIVE}"}; : ${PKG_WOLFSSL_SUBDIR:=wolfssl-${PKG_WOLFSSL_VERSION}-stable}; -: ${PKG_WOLFSSL_INSTALL_FILES:="../obj/wolfssl/options.h=include/wolfssl/options.h ../obj/cyassl/options.h=include/cyassl/options.h"}; +: ${PKG_WOLFSSL_INSTALL_FILES_V2:=" + +../obj/cyassl/options.h=include/cyassl/%[FNAME] + +../obj/wolfssl/options.h=include/wolfssl/%[FNAME]"}; # vim:filetype=sh textwidth=0 -- cgit v1.2.3