diff options
30 files changed, 488 insertions, 622 deletions
diff --git a/etc/README.md b/etc/README.md index be8c54f6..8bde798e 100644 --- a/etc/README.md +++ b/etc/README.md @@ -563,22 +563,26 @@ Build step status is tracked on a per-package basis by state files beneath ``${BUILD_WORKDIR}`` following the format ``.<package name>.<build step>``; package build completion corresponds to the pseudo-build step ``finish``. -| Name | Description | -| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| fetch_download | Download package archive & verify w/ SHA-256 message digest and/or clone Git repository/ies | -| fetch_extract | Extract package archive, if any | -| configure_patch_pre | Apply ``chainport`` patches and/or patches beneath ``patches/`` prior to (GNU autotools or similar) configuration | -| configure_autotools | Bootstrap (GNU autools or similar) environment, and install ``config.sub`` and ``config.cache`` | -| configure_patch | Apply patches beneath ``patches/`` and/or set in ``${PKG_PATCHES_EXTRA}`` after (GNU autotools or similar) configuration | -| configure | Perform package (GNU autools or similar) configuration w/ configuration-time set of environment variables | -| build | Call ``make(1)`` w/ build-time set of make variables | -| install_subdirs | Create default directory hierarchy in ``${PKG_DESTDIR}``, optionally amended w/ ``${PKG_INSTALL_FILES_DESTDIR_EXTRA}`` | -| install_make | Call ``make(1)`` w/ ``${PKG_INSTALL_TARGET}`` (defaults to ``install``) and installation-time set of make variables | -| install_files | Install ``${PKG_INSTALL_FILES}``, fix directory and file mode bits within ``${PKG_DESTDIR}`` and optionally ``${PKG_DESTDIR_HOST}``, ``pkgconf(1)`` package files, and/or stripped binaries within ``${PKG_DESTDIR}`` | -| install_libs | Purge libtool ``.la`` files and install shared objects within ``${PKG_DESTDIR}`` w/ ``perk`` and corresponding symbolic links | -| install | Install into ``${PKG_PREFIX}``, and optionally ``${PKG_DESTDIR_HOST}`` into ``${PREFIX}``, under mutex, and add package to ``${PREFIX}/pkglist.${PKG_BUILD_TYPE}`` (unless inhibited) | -| install_rpm | Build package RPM w/ auto-generated specifiation file based on ``etc/package.spec`` beneath ``${PREFIX_RPM}`` | -| clean | Clean ``${PKG_BUILD_DIR}`` and/or ``${PKG_DESTDIR}`` and/or ``${PKG_DESTDIR_HOST}`` and/or ``${PKG_BASE_DIR}/${PKG_SUBDIR}`` as per ``-C build,dest,src``, resp., if any | +| Name | Description | +| ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| fetch_clean | Delete and create ``${PKG_SUBDIR}'' | +| fetch_download | Download package archive & verify w/ SHA-256 message digest and/or clone Git repository/ies | +| fetch_extract | Extract package archive, if any | +| configure_clean | Delete and create ``${PKG_BUILD_DIR}'' | +| configure_patch_pre | Apply ``chainport`` patches and/or patches beneath ``patches/`` prior to (GNU autotools or similar) configuration | +| configure_autotools | Bootstrap (GNU autools or similar) environment, and install ``config.sub`` and ``config.cache`` | +| configure_patch | Apply patches beneath ``patches/`` and/or set in ``${PKG_PATCHES_EXTRA}`` after (GNU autotools or similar) configuration | +| configure | Perform package (GNU autools or similar or CMake) configuration w/ configuration-time set of environment variables | +| build_clean | Clean ``${PKG_BUILD_DIR}'' w/ ``make clean'' invocation | +| build | Call ``make(1)`` w/ build-time set of make variables | +| install_clean | Delete and create ``${PKG_DESTDIR}'' | +| install_subdirs | Create default directory hierarchy in ``${PKG_DESTDIR}``, optionally amended w/ ``${PKG_INSTALL_FILES_DESTDIR_EXTRA}`` | +| install_make | Call ``make(1)`` w/ ``${PKG_INSTALL_TARGET}`` (defaults to ``install``) and installation-time set of make variables | +| install_files | Install ``${PKG_INSTALL_FILES}``, fix directory and file mode bits within ``${PKG_DESTDIR}`` and optionally ``${PKG_DESTDIR_HOST}``, ``pkgconf(1)`` package files, and/or stripped binaries within ``${PKG_DESTDIR}`` | +| install_libs | Purge libtool ``.la`` files and install shared objects within ``${PKG_DESTDIR}`` w/ ``perk`` and corresponding symbolic links | +| install | Install into ``${PKG_PREFIX}``, and optionally ``${PKG_DESTDIR_HOST}`` into ``${PREFIX}``, under mutex, and add package to ``${PREFIX}/pkglist.${PKG_BUILD_TYPE}`` (unless inhibited) | +| install_rpm | Build package RPM w/ auto-generated specifiation file based on ``etc/package.spec`` beneath ``${PREFIX_RPM}`` | +| clean | Clean ``${PKG_BUILD_DIR}`` and/or ``${PKG_DESTDIR}`` and/or ``${PKG_DESTDIR_HOST}`` and/or ``${PKG_BASE_DIR}/${PKG_SUBDIR}`` as per ``-C build,dest,src``, resp., if any | [Back to top](#table-of-contents) @@ -611,73 +615,87 @@ line, with each variable prefixed w/ ``PKG_``, e.g.: The minimum set of package variables that must be provided is ``SHA256SUM, URL, VERSION`` and/or ``URLS_GIT``, respectively. -| Package variable name | Description | -| --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | -| AR | Command- or pathname of toolchain library archive editor ``ar(1)`` | -| BASE_DIR | Absolute pathname to package build root directory beneath ``${BUILD_WORKDIR}`` | -| BUILD_DIR | Directory name of package build directory beneath ``${PKG_BASE_DIR}`` | -| BUILD_STEPS_DISABLE | List of build steps to disable during package build | -| BUILD_TYPE | Cross-compiled toolchain (``cross``,) host (``host``,) or cross-compiled package (``native``) build type | -| CC | Command- or pathname of toolchain C compiler ``cc(1)`` | -| CFLAGS_BUILD | C compiler flags during package ``make(1)`` build | -| CFLAGS_BUILD_EXTRA | Additional C compiler flags during package ``make(1)`` build | -| CFLAGS_CONFIGURE | C compiler flags during package (GNU autotools or similar) configuration | -| CFLAGS_CONFIGURE_EXTRA | Additional C compiler flags during package (GNU autotools or similar) configuration | -| CONFIG_CACHE | List of GNU autotools configuration cache variables | -| CONFIG_CACHE_EXTRA | Additional list of GNU autotools configuration cache variables | -| CONFIG_CACHE_LOCAL | Additional list of GNU autotools configuration cache variables | -| CONFIGURE | Command- or pathname to package (GNU autotools or similar) configuration script | -| CONFIGURE_ARGS | List of arguments to package (GNU autotools or similar) configuration script | -| CONFIGURE_ARGS_EXTRA | Additional list of arguments to package (GNU autotools or similar) configuration script | -| CXX | Command- or pathname of toolchain C++ compiler ``c++(1)`` | -| CXXFLAGS_CONFIGURE | List of C++ compiler flags during package (GNU autotools or similar) configuration | -| CXXFLAGS_CONFIGURE_EXTRA | Additional list of C++ compiler flags during package (GNU autotools or similar) configuration | -| DEPENDS | List of package-package dependencies | -| DESTDIR | Directory name of package installation destination directory beneath ``${PKG_BASE_DIR}`` | -| DESTDIR_HOST | Directory name of optional host package installation destination directory beneath ``${PKG_BASE_DIR}`` | -| DISABLED | Disable package | -| ENV_VARS_EXTRA | List of double colon-separated environment variable equality sign-separated name-value pairs to set during package build | -| FNAME | Filename of package archive file | -| FORCE_AUTORECONF | Forcibly run ``autoreconf -fiv`` prior to package (GNU autotools or similar) configuration | -| GITROOT | midipix packages Git URL prefix | -| INHERIT_FROM | Inherit variables from named package | -| INSTALL_FILES | Whitespace-separated list of files to manually install into the package installation destination directory beneath ``${PKG_BASE_DIR}`` | -| INSTALL_FILES_DESTDIR | Whitespace-separated list of files to initialise the package installation destination directory beneath ``${PKG_BASE_DIR}`` with | -| INSTALL_FILES_DESTDIR_EXTRA | Additional whitespace-separated list of files to initialise the package installation destination directory beneath ``${PKG_BASE_DIR}`` with | -| INSTALL_TARGET | Name of package build ``make(1)`` installation target | -| INSTALL_TARGET_EXTRA | Additional name of package build ``make(1)`` installation target | -| IN_TREE | Build package in-tree within ``${PKG_SUBDIR}`` | -| LDFLAGS_BUILD_EXTRA | Additional linker flags during package ``make(1)`` build | -| LDFLAGS_CONFIGURE | Linker flags during package (GNU autotools or similar) configuration | -| LDFLAGS_CONFIGURE_EXTRA | Additional linker flags during package (GNU autotools or similar) configuration | -| LIBTOOL | Command- or pathname of ``libtool(1)`` (defaults to ``slibtool``) | -| MAKE | Command line of ``make(1)`` | -| MAKE_SUBDIRS | List of ``make(1)`` subdirectories to exclusively build | -| MAKEFLAGS_BUILD | List of ``make(1)`` flags during package ``make(1)`` build | -| MAKEFLAGS_BUILD_EXTRA | Additional list of ``make(1)`` flags during package ``make(1)`` build | -| MAKEFLAGS_INSTALL | List of ``make(1)`` flags during package ``make(1)`` installation | -| MAKEFLAGS_INSTALL_EXTRA | Additional list of ``make(1)`` flags during package ``make(1)`` installation | -| MAKEFLAGS_VERBOSITY | Variable-value pair to pass to ``make(1)`` in order to force echo-back of command lines prior to execution | -| MAKE_INSTALL_VNAME | Variable name of ``make(1)`` installation destination directory variable during package ``make(1)`` installation | -| MIRRORS | List of package archive mirror base URLs to attempt downloading from; cf. ``pkgtool.sh -m <dname>`` | -| MIRRORS_GIT | List of package Git repository mirror base URLs to attempt cloning from; cf. ``pkgtool.sh -m <dname>`` | -| NO_CLEAN | Inhibit cleaning of package build directory beneath ``${PKG_BASE_DIR}`` pre-finish | -| NO_CLEAN_BASE_DIR | Inhibit cleaning of package build root directory beneath ``${BUILD_WORKDIR}`` | -| NO_LOG_VARS | Inhibit logging of build & package variables pre-package build | -| PATCHES_EXTRA | Additional list of patches to apply | -| PKG_CONFIG | Command- or pathname of ``pkg-config(1)`` | -| PKG_CONFIG_LIBDIR | ``pkg-config(1)`` search directory | -| PKGLIST_DISABLE | Inhibit inclusion into ``${PREFIX}/pkglist.${PKG_BUILD_TYPE}`` | -| PREFIX | Absolute pathname of top-level installation directory and package search path | -| PYTHON | Command- or pathname of Python | -| RANLIB | Command- or pathname of toolchain library archive index generator ``ranlib(1)`` | -| RPM_DISABLE | Inhibit creation of RPM archive | -| SHA256SUM | SHA-256 message digest of package archive | -| SUBDIR | Name of extracted archive or git-{clone,pull}(1)'d directory | -| TARGET | Dash-separated {build,host,target} triplet | -| URL | URL to package archive, optionally appended with whitespace-separated list of alternative URLs | -| URLS_GIT | List of package Git URL(s) (``*name*=*URL*@*branch*``) | -| VERSION | Package version | +| Package variable name | Description | +| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | +| AR | Command- or pathname of toolchain library archive editor ``ar(1)`` | +| BASE_DIR | Absolute pathname to package build root directory beneath ``${BUILD_WORKDIR}`` | +| BUILD_DIR | Directory name of package build directory beneath ``${PKG_BASE_DIR}`` | +| BUILD_STEPS_DISABLE | List of build steps to disable during package build | +| BUILD_TYPE | Cross-compiled toolchain (``cross``,) host (``host``,) or cross-compiled package (``native``) build type | +| CC | Command- or pathname of toolchain C compiler ``cc(1)`` | +| CFLAGS_BUILD | C compiler flags during package ``make(1)`` build | +| CFLAGS_BUILD_EXTRA | Additional C compiler flags during package ``make(1)`` build | +| CFLAGS_CONFIGURE | C compiler flags during package (GNU autotools or similar) configuration | +| CFLAGS_CONFIGURE_EXTRA | Additional C compiler flags during package (GNU autotools or similar) configuration | +| CMAKE | Command- or pathname to ``cmake(1)`` | +| CMAKE_ARGS | List of arguments to ``cmake(1)`` | +| CMAKE_ARGS_EXTRA | Additional list of arguments to ``cmake(1)`` | +| CMAKE_LISTFILE | File- or pathname to ``cmake(1)`` listfile | +| CONFIG_CACHE | List of GNU autotools configuration cache variables | +| CONFIG_CACHE_EXTRA | Additional list of GNU autotools configuration cache variables | +| CONFIG_CACHE_LOCAL | Additional list of GNU autotools configuration cache variables | +| CONFIGURE | Command- or pathname to package (GNU autotools or similar) configuration script | +| CONFIGURE_ARGS | List of arguments to package (GNU autotools or similar) configuration script | +| CONFIGURE_ARGS_EXTRA | Additional list of arguments to package (GNU autotools or similar) configuration script | +| CONFIGURE_TYPE | Force package configuration via either of ``autotools`` (GNU autotools or similar) or ``sofort`` or ``cmake`` (CMake) | +| CXX | Command- or pathname of toolchain C++ compiler ``c++(1)`` | +| CXXFLAGS_CONFIGURE | List of C++ compiler flags during package (GNU autotools or similar) configuration | +| CXXFLAGS_CONFIGURE_EXTRA | Additional list of C++ compiler flags during package (GNU autotools or similar) configuration | +| DEPENDS | List of package-package dependencies | +| DESTDIR | Directory name of package installation destination directory beneath ``${PKG_BASE_DIR}`` | +| DESTDIR_HOST | Directory name of optional host package installation destination directory beneath ``${PKG_BASE_DIR}`` | +| DISABLED | Disable package | +| ENV_VARS_EXTRA | List of double colon-separated environment variable equality sign-separated name-value pairs to set during package build | +| FNAME | Filename of package archive file | +| FORCE_AUTORECONF | Forcibly run ``autoreconf -fiv`` prior to package (GNU autotools or similar) configuration | +| GITROOT | midipix packages Git URL prefix | +| INHERIT_FROM | Inherit variables from named package | +| INSTALL_FILES | Whitespace-separated list of files to manually install into the package installation destination directory beneath ``${PKG_BASE_DIR}`` | +| INSTALL_FILES_DESTDIR | Whitespace-separated list of files to initialise the package installation destination directory beneath ``${PKG_BASE_DIR}`` with | +| INSTALL_FILES_DESTDIR_EXTRA | Additional whitespace-separated list of files to initialise the package installation destination directory beneath ``${PKG_BASE_DIR}`` with | +| INSTALL_TARGET | Name of package build ``make(1)`` installation target | +| INSTALL_TARGET_EXTRA | Additional name of package build ``make(1)`` installation target | +| IN_TREE | Build package in-tree within ``${PKG_SUBDIR}`` | +| LDFLAGS_BUILD_EXTRA | Additional linker flags during package ``make(1)`` build | +| LDFLAGS_CONFIGURE | Linker flags during package (GNU autotools or similar) configuration | +| LDFLAGS_CONFIGURE_EXTRA | Additional linker flags during package (GNU autotools or similar) configuration | +| LIBTOOL | Command- or pathname of ``libtool(1)`` (defaults to ``slibtool``) | +| MAKE | Command line of ``make(1)`` | +| MAKEFLAGS_BUILD_EXTRA | Additional list of ``make(1)`` flags during package ``make(1)`` build | +| MAKEFLAGS_BUILD | List of ``make(1)`` flags during package ``make(1)`` build | +| MAKEFLAGS_INSTALL_EXTRA | Additional list of ``make(1)`` flags during package ``make(1)`` installation | +| MAKEFLAGS_INSTALL | List of ``make(1)`` flags during package ``make(1)`` installation | +| MAKEFLAGS_VERBOSITY | Variable-value pair to pass to ``make(1)`` in order to force echo-back of command lines prior to execution | +| MAKE_INSTALL_VNAME | Variable name of ``make(1)`` installation destination directory variable during package ``make(1)`` installation | +| MAKE_SUBDIRS | List of ``make(1)`` subdirectories to exclusively build | +| MIRRORS_GIT | List of package Git repository mirror base URLs to attempt cloning from; cf. ``pkgtool.sh -m <dname>`` | +| MIRRORS | List of package archive mirror base URLs to attempt downloading from; cf. ``pkgtool.sh -m <dname>`` | +| NO_CLEAN | Inhibit cleaning of package build directory beneath ``${PKG_BASE_DIR}`` pre-finish | +| NO_CLEAN_BASE_DIR | Inhibit cleaning of package build root directory beneath ``${BUILD_WORKDIR}`` | +| NO_LOG_VARS | Inhibit logging of build & package variables pre-package build | +| PATCHES_EXTRA | Additional list of patches to apply | +| PKG_CONFIG | Command- or pathname of ``pkg-config(1)`` | +| PKG_CONFIG_LIBDIR | ``pkg-config(1)`` search directory | +| PKGLIST_DISABLE | Inhibit inclusion into ``${PREFIX}/pkglist.${PKG_BUILD_TYPE}`` | +| PREFIX | Absolute pathname of top-level installation directory and package search path | +| PYTHON | Command- or pathname of Python | +| RANLIB | Command- or pathname of toolchain library archive index generator ``ranlib(1)`` | +| RPM_DISABLE | Inhibit creation of RPM archive | +| SHA256SUM | SHA-256 message digest of package archive | +| SOFORT_NATIVE_CC | ``sofort`` variable during ``native`` build: Command- or pathname of toolchain C compiler ``cc(1)`` | +| SOFORT_NATIVE_CFLAGS | ``sofort`` variable during ``native`` build: C compiler flags during package (GNU autotools or similar) configuration | +| SOFORT_NATIVE_CFLAGS_EXTRA | ``sofort`` variable during ``native`` build: Additional C compiler flags during package (GNU autotools or similar) configuration | +| SOFORT_NATIVE_CXX | ``sofort`` variable during ``native`` build: Command- or pathname of toolchain C++ compiler ``c++(1)`` | +| SOFORT_NATIVE_CXXFLAGS | ``sofort`` variable during ``native`` build: List of C++ compiler flags during package (GNU autotools or similar) configuration | +| SOFORT_NATIVE_CXXFLAGS_EXTRA | ``sofort`` variable during ``native`` build: Additional list of C++ compiler flags during package (GNU autotools or similar) configuration | +| SOFORT_NATIVE_LD | ``sofort`` variable during ``native`` build: Command- or pathname of toolchain C compiler ``cc(1)`` | +| SOFORT_NATIVE_LDFLAGS | ``sofort`` variable during ``native`` build: Linker flags during package (GNU autotools or similar) configuration | +| SOFORT_NATIVE_LDFLAGS_EXTRA | ``sofort`` variable during ``native`` build: Additional linker flags during package (GNU autotools or similar) configuration | +| SUBDIR | Name of extracted archive or git-{clone,pull}(1)'d directory | +| TARGET | Dash-separated {build,host,target} triplet | +| URL | URL to package archive, optionally appended with whitespace-separated list of alternative URLs | +| URLS_GIT | List of package Git URL(s) (``*name*=*URL*@*branch*``) | +| VERSION | Package version | [Back to top](#table-of-contents) diff --git a/groups/000.host_tools.group b/groups/000.host_tools.group index aa7cada1..0ac365ba 100644 --- a/groups/000.host_tools.group +++ b/groups/000.host_tools.group @@ -9,9 +9,6 @@ autoconf_host autoconf_2_64_host automake_host automake_1_11_6_host gettext_tiny_host install_strip_host libtool_host m4_host pkgconf_host slibtool_host tpax_host"; HOST_TOOLS_PREFIX="${PREFIX}"; -HOST_TOOLS_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include"; -HOST_TOOLS_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include"; -HOST_TOOLS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_AUTOCONF_HOST_DEPENDS:="m4_host pkgconf_host slibtool_host"}; : ${PKG_AUTOCONF_HOST_SHA256SUM:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684}; : ${PKG_AUTOCONF_HOST_VERSION:=2.69}; diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group index feab8841..4bfb2c99 100644 --- a/groups/010.host_deps.group +++ b/groups/010.host_deps.group @@ -19,9 +19,6 @@ perk_host python2_host python3_host ruby_host sbsigntools_host sqlite3_host texinfo_host tzdb_host util_linux_host xz_host"; HOST_DEPS_PKG_CONFIG="${PREFIX}/bin/pkgconf"; HOST_DEPS_PREFIX="${PREFIX}"; -HOST_DEPS_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include"; -HOST_DEPS_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include"; -HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_BINUTILS_BUILD_DEPENDS:="texinfo_host"}; : ${PKG_BINUTILS_BUILD_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; : ${PKG_BINUTILS_BUILD_VERSION:=2.24.51}; @@ -60,6 +57,14 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_CLANG_HOST_VERSION:=3.8.1}; : ${PKG_CLANG_HOST_URL:=http://releases.llvm.org/${PKG_CLANG_HOST_VERSION}/cfe-${PKG_CLANG_HOST_VERSION}.src.tar.xz}; : ${PKG_CLANG_HOST_DISABLED:=1}; +: ${PKG_CLANG_HOST_CMAKE_ARGS_EXTRA:=" + -DCLANG_BUILD_EXAMPLES:BOOL=OFF + -DCLANG_INCLUDE_DOCS:BOOL=OFF + -DCLANG_INCLUDE_TESTS:BOOL=OFF + -DLIBCLANG_BUILD_STATIC:BOOL=ON + -DLLVM_PREFIX=${PREFIX_NATIVE} + -G Unix Makefiles + -Wno-dev"}; : ${PKG_CLZIP_HOST_SHA256SUM:=d9d51212afa80371dc2546d278ef8ebbb3cd57c06fdd761b7b204497586d24c0}; : ${PKG_CLZIP_HOST_VERSION:=1.11}; : ${PKG_CLZIP_HOST_URL:=http://download.savannah.gnu.org/releases/lzip/clzip/clzip-${PKG_CLZIP_HOST_VERSION}.tar.gz}; @@ -69,7 +74,11 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_CMAKE_HOST_SHA256SUM:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0}; : ${PKG_CMAKE_HOST_VERSION:=3.7.2}; : ${PKG_CMAKE_HOST_URL:=https://cmake.org/files/v${PKG_CMAKE_HOST_VERSION%.*}/cmake-${PKG_CMAKE_HOST_VERSION}.tar.gz}; -: ${PKG_CMAKE_HOST_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix=${PREFIX}"}; +: ${PKG_CMAKE_HOST_CONFIGURE_TYPE:="cmake"}; +: ${PKG_CMAKE_HOST_CMAKE_ARGS_EXTRA:=" + -DCURSES_NCURSES_LIBRARY=${PREFIX}/lib/libncurses.so +"}; +: ${PKG_CMAKE_HOST_INSTALL_FILES:="../cmake-${PKG_CMAKE_HOST_VERSION}/Modules/Platform/BSDOS.cmake=share/cmake-${PKG_CMAKE_HOST_VERSION%.*}/Modules/Platform/Midipix.cmake"}; : ${PKG_DBUS_HOST_DEPENDS:="expat_host"}; : ${PKG_DBUS_HOST_VERSION:=1.11.20}; : ${PKG_DBUS_HOST_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_HOST_VERSION}.tar.gz}; @@ -85,6 +94,7 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_EXPAT_HOST_VERSION:=2.3.0}; : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.xz}; : ${PKG_EXPAT_HOST_CONFIGURE_ARGS_EXTRA:="--without-docbook"}; +: ${PKG_EXPAT_HOST_CONFIGURE_TYPE:="autotools"}; : ${PKG_FILE_HOST_SHA256SUM:=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1}; : ${PKG_FILE_HOST_VERSION:=5.39}; : ${PKG_FILE_HOST_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz}; @@ -153,10 +163,24 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_LIBZIP_HOST_SHA256SUM:=a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac}; : ${PKG_LIBZIP_HOST_VERSION:=1.7.1}; : ${PKG_LIBZIP_HOST_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_HOST_VERSION}.tar.xz}; +: ${PKG_LIBZIP_HOST_CMAKE_ARGS_EXTRA:=" + -DENABLE_GNUTLS=:BOOL=OFF + -DENABLE_MBEDTLS=:BOOL=OFF +"}; : ${PKG_LLVM_HOST_SHA256SUM:=6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9}; : ${PKG_LLVM_HOST_VERSION:=3.8.1}; : ${PKG_LLVM_HOST_URL:=http://releases.llvm.org/${PKG_LLVM_HOST_VERSION}/llvm-${PKG_LLVM_HOST_VERSION}.src.tar.xz}; : ${PKG_LLVM_HOST_DISABLED:=1}; +: ${PKG_LLVM_HOST_CMAKE_ARGS_EXTRA:=" + -DCMAKE_BUILD_TYPE=Release + -DLLVM_BUILD_DOCS=NO + -DLLVM_BUILD_EXAMPLES=NO + -DLLVM_BUILD_TESTS=NO + -DLLVM_ENABLE_SPHINX=NO + -DLLVM_TARGETS_TO_BUILD=X86 + -DSPHINX_WARNINGS_AS_ERRORS=NO + -G Unix Makefiles + -Wno-dev"}; : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"}; : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix="}; : ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin bin/mdso=${DEFAULT_TARGET}/bin/mdso"}; @@ -203,8 +227,7 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_PYTHON2_HOST_BUILD_DIR:=build/python2}; : ${PKG_PYTHON2_HOST_CONFIGURE:=build/sbpython2/configure}; : ${PKG_PYTHON2_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_HOST_VERSION} --prefix=${PREFIX}"}; -: ${PKG_PYTHON2_HOST_ENV_VARS_EXTRA:="PYCOMPILE_CFLAGS=-I${PREFIX}/include"}; -: ${PKG_PYTHON2_HOST_SOFORT_FORCE:=1}; +: ${PKG_PYTHON2_HOST_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON2_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"}; : ${PKG_PYTHON2_HOST_SUBDIR:=Python-${PKG_PYTHON2_HOST_VERSION}}; : ${PKG_PYTHON3_HOST_DEPENDS:="bzip2_host expat_host gdbm_host libffi_host libreadline_host libressl_host libz_host ncurses_host ncursesw_host sqlite3_host xz_host"}; @@ -216,11 +239,9 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_PYTHON3_HOST_BUILD_DIR:=build/python3}; : ${PKG_PYTHON3_HOST_CONFIGURE:=build/sbpython3/configure}; : ${PKG_PYTHON3_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_HOST_VERSION} --prefix=${PREFIX}"}; -: ${PKG_PYTHON3_HOST_ENV_VARS_EXTRA:="PYCOMPILE_CFLAGS=-I${PREFIX}/include"}; +: ${PKG_PYTHON3_HOST_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON3_HOST_INSTALL_FILES:="@python3=bin/python"}; : ${PKG_PYTHON3_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"}; -: ${PKG_PYTHON3_HOST_SOFORT_FORCE:=1}; -: ${PKG_PYTHON3_HOST_SOFORT_NATIVE_CC:="${DEFAULT_HOST_CC}"}; : ${PKG_PYTHON3_HOST_SUBDIR:=Python-${PKG_PYTHON3_HOST_VERSION}}; : ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507}; : ${PKG_RUBY_HOST_VERSION:=2.3.0}; diff --git a/groups/200.native_packages.group b/groups/200.native_packages.group index bc4a5061..886fab53 100644 --- a/groups/200.native_packages.group +++ b/groups/200.native_packages.group @@ -12,8 +12,5 @@ NATIVE_PACKAGES_PACKAGES=""; NATIVE_PACKAGES_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2"; -NATIVE_PACKAGES_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include"; -NATIVE_PACKAGES_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include"; -NATIVE_PACKAGES_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; # vim:filetype=sh textwidth=0 diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group index faf237fd..2ebbc07b 100644 --- a/groups/221.native_packages_dev.group +++ b/groups/221.native_packages_dev.group @@ -116,7 +116,7 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")" : ${PKG_PYTHON2_BUILD_DIR:=build/python2}; : ${PKG_PYTHON2_CONFIGURE:=build/sbpython2/configure}; : ${PKG_PYTHON2_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"}; -: ${PKG_PYTHON2_SOFORT_FORCE:=1}; +: ${PKG_PYTHON2_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON2_SOFORT_NATIVE_CFLAGS_EXTRA:="-std=c99 -D_XOPEN_SOURCE=700"}; : ${PKG_PYTHON2_SUBDIR:=Python-${PKG_PYTHON2_VERSION}}; : ${PKG_PYTHON3_DEPENDS:="bzip2 curl expat gdbm libffi libreadline libressl libz ncursesw sqlite3 xz"}; @@ -128,7 +128,7 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")" : ${PKG_PYTHON3_BUILD_DIR:=build/python3}; : ${PKG_PYTHON3_CONFIGURE:=build/sbpython3/configure}; : ${PKG_PYTHON3_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"}; -: ${PKG_PYTHON3_SOFORT_FORCE:=1}; +: ${PKG_PYTHON3_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON3_SOFORT_NATIVE_CFLAGS_EXTRA:="-std=c99 -D_XOPEN_SOURCE=700"}; : ${PKG_PYTHON3_INSTALL_FILES:="@python3=bin/python"}; : ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}}; diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index d5819346..66ac9a71 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -67,7 +67,31 @@ zstd")"; : ${PKG_CMAKE_VERSION:=3.7.2}; : ${PKG_CMAKE_URL:=https://cmake.org/files/v${PKG_CMAKE_VERSION%.*}/cmake-${PKG_CMAKE_VERSION}.tar.gz}; : ${PKG_CMAKE_CFLAGS_CONFIGURE_EXTRA:="-g0 -O2"}; -: ${PKG_CMAKE_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix="}; +: ${PKG_CMAKE_CMAKE_ARGS_EXTRA:=" + -DBZIP2_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DBZIP2_LIBRARIES=${PREFIX_NATIVE}/lib/libbz2.a + -DCMAKE_USE_SYSTEM_BZIP2=ON + -DCMAKE_USE_SYSTEM_CURL=ON + -DCMAKE_USE_SYSTEM_EXPAT=OFF + -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON + -DCMAKE_USE_SYSTEM_LIBUV=ON + -DCMAKE_USE_SYSTEM_ZLIB=ON + -DCURL_INCLUDE_DIR=${PREFIX_NATIVE}/include/curl + -DCURL_LIBRARY=${PREFIX_NATIVE}/lib/libcurl.lib.a + -DCURSES_NCURSES_LIBRARY=${PREFIX_NATIVE}/lib/libncurses.lib.a + -DKWSYS_LFS_WORKS=YES + -DLibArchive_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLibArchive_LIBRARY=${PREFIX_NATIVE}/lib/libarchive.lib.a + -DLIBLZMA_HAS_AUTO_DECODER=YES + -DLIBLZMA_HAS_EASY_ENCODER=YES + -DLIBLZMA_HAS_LZMA_PRESET=YES + -DLIBLZMA_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLIBLZMA_LIBRARY=${PREFIX_NATIVE}/lib/liblzma.lib.a + -DLibUV_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLibUV_LIBRARY=${PREFIX_NATIVE}/lib/libuv.1.0.0.lib.a + -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a"}; +: ${PKG_CMAKE_CONFIGURE_TYPE:="cmake"}; : ${PKG_CRON_URLS_GIT:="pkg-cron=https://github.com/lalbornoz/pkg-cron@master"}; : ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"}; : ${PKG_CRON_IN_TREE:=1}; @@ -241,6 +265,17 @@ zstd")"; : ${PKG_MINIZIP_SHA256SUM:=f4c8e7afdd45a093f69d7d338652996766d5473e63ad97a2c5cf89c0787773a0}; : ${PKG_MINIZIP_VERSION:=2.10.4}; : ${PKG_MINIZIP_URL:=https://github.com/nmoinvaz/minizip/archive/${PKG_MINIZIP_VERSION}.tar.gz}; +: ${PKG_MINIZIP_CMAKE_ARGS_EXTRA:=" + -DBUILD_SHARED_LIBS=ON + -DBZIP2_LIBRARIES=${PREFIX_NATIVE}/lib/libbz2.lib.a + -DPKG_CONFIG_EXECUTABLE=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config + -DMZ_BUILD_TEST=ON + -DMZ_LIBBSD=OFF + -DMZ_LZMA=ON + -DMZ_OPENSSL=ON + -DMZ_ZSTD=OFF + -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DZLIB_LIBRARY_DEBUG=${PREFIX_NATIVE}/lib/libz.lib.a"}; : ${PKG_MINIZIP_SUBDIR:=minizip-ng-${PKG_MINIZIP_VERSION}}; : ${PKG_MINTTY_DEPENDS:="w32api w32lib"}; : ${PKG_MINTTY_URLS_GIT:="mintty=https://github.com/midipix-ports/mintty.git@midipix bmintty=https://github.com/midipix-ports/bmintty.git@main"}; @@ -287,6 +322,18 @@ zstd")"; : ${PKG_OPENJPEG_SHA256SUM:=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d}; : ${PKG_OPENJPEG_VERSION:=2.4.0}; : ${PKG_OPENJPEG_URL:=https://github.com/uclouvain/openjpeg/archive/v${PKG_OPENJPEG_VERSION}.tar.gz}; +: ${PKG_OPENJPEG_CMAKE_ARGS_EXTRA:=" + -DLCMS2_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLCMS2_LIBRARY=${PREFIX_NATIVE}/lib/liblcms2.lib.a + -DPNG_LIBRARY_DEBUG=${PREFIX_NATIVE}/lib/libpng.lib.a + -DPNG_LIBRARY_RELEASE=${PREFIX_NATIVE}/lib/libpng.lib.a + -DPNG_PNG_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DTIFF_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DTIFF_LIBRARY_DEBUG=${PREFIX_NATIVE}/lib/libtiff.lib.a + -DTIFF_LIBRARY_RELEASE=${PREFIX_NATIVE}/lib/libtiff.lib.a + -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DZLIB_LIBRARY_DEBUG=${PREFIX_NATIVE}/lib/libz.a + -DZLIB_LIBRARY_RELEASE=${PREFIX_NATIVE}/lib/libz.a"}; : ${PKG_OPENJPEG_SUBDIR:=openjpeg-${PKG_OPENJPEG_VERSION}}; : ${PKG_P7ZIP_URLS_GIT:="p7zip-midipix.git=https://github.com/lalbornoz/p7zip-midipix.git@master"}; : ${PKG_P7ZIP_BUILD_STEPS_DISABLE:=install_make}; @@ -374,6 +421,7 @@ zstd")"; : ${PKG_TDNF_SHA256SUM:=1ca20b176939f32c212f8dec7bfacd99995f1cb16c7f176b90394378ea854b0b}; : ${PKG_TDNF_VERSION:=2.1.1}; : ${PKG_TDNF_URL:=https://github.com/vmware/tdnf/archive/v${PKG_TDNF_VERSION}/tdnf-${PKG_TDNF_VERSION}.tar.gz}; +: ${PKG_TDNF_CMAKE_ARGS_EXTRA:="-DOPENSSL_LIBRARY=${PREFIX_NATIVE}/lib/libcrypto.so"}; : ${PKG_TDNF_IN_TREE:=1}; : ${PKG_TDNF_SUBDIR:=tdnf-${PKG_TDNF_VERSION}}; : ${PKG_TEXINFO_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa}; @@ -394,7 +442,6 @@ zstd")"; : ${PKG_TZDB_BUILD_DIR:="tzdb-${PKG_TZDB_VERSION}"}; : ${PKG_TZDB_MAKEFLAGS_INSTALL_EXTRA:="ZIC=${PREFIX}/sbin/zic"}; : ${PKG_UTF8PROC_URLS_GIT:="utf8proc=https://github.com/JuliaStrings/utf8proc@master"}; -: ${PKG_UTF8PROC_IN_TREE:=1}; : ${PKG_UTIL_LINUX_DEPENDS:="ncursesw"}; : ${PKG_UTIL_LINUX_SHA256SUM:=37de03dbb98cdeffdf9e754122b0aca2a9bbdc19769f6570dfcb6f123643bf53}; : ${PKG_UTIL_LINUX_VERSION:=2.36.1}; @@ -427,6 +474,10 @@ zstd")"; : ${PKG_XPDF_SHA256SUM:=52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4}; : ${PKG_XPDF_VERSION:=4.02}; : ${PKG_XPDF_URL:=https://dl.xpdfreader.com/xpdf-${PKG_XPDF_VERSION}.tar.gz}; +: ${PKG_XPDF_CMAKE_ARGS_EXTRA:=" + -DFREETYPE_LIBRARY=${PREFIX_NATIVE}/lib/libfreetype.lib.a + -DFREETYPE_INCLUDE_DIR_ft2build=${PREFIX_NATIVE}/include/ft2build + -DFONTCONFIG_LIBRARY=${PREFIX_NATIVE}/lib/libfontconfig.lib.a"}; : ${PKG_XZ_SHA256SUM:=3e1e518ffc912f86608a8cb35e4bd41ad1aec210df2a47aaa1f95e7f5576ef56}; : ${PKG_XZ_VERSION:=5.2.5}; : ${PKG_XZ_URL:=https://fossies.org/linux/misc/xz-${PKG_XZ_VERSION}.tar.xz}; diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index fb3c730c..fdad19ab 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -107,6 +107,12 @@ libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image : ${PKG_LIBJPEG_TURBO_SHA256SUM:=d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb}; : ${PKG_LIBJPEG_TURBO_VERSION:=2.0.6}; : ${PKG_LIBJPEG_TURBO_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/libjpeg-turbo/libjpeg-turbo-${PKG_LIBJPEG_TURBO_VERSION}.tar.gz}; +: ${PKG_LIBJPEG_TURBO_CMAKE_ARGS_EXTRA:=" + -DCMAKE_ASM_NASM_COMPILER=${PREFIX}/bin/${DEFAULT_TARGET}-nasm + -DCMAKE_ASM_NASM_OBJECT_FORMAT=win64 + -DWITH_SIMD=OFF + -DWITH_JPEG8=ON +"}; : ${PKG_LIBKSBA_DEPENDS:="libgpg_error"}; : ${PKG_LIBKSBA_SHA256SUM:=b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921}; : ${PKG_LIBKSBA_VERSION:=1.5.1}; @@ -182,11 +188,40 @@ libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image : ${PKG_LIBSOLV_VERSION:=0.6.34}; : ${PKG_LIBSOLV_URL:=https://github.com/openSUSE/libsolv/archive/${PKG_LIBSOLV_VERSION}.tar.gz}; : ${PKG_LIBSOLV_SUBDIR:=libsolv-${PKG_LIBSOLV_VERSION}}; +: ${PKG_LIBSOLV_CMAKE_ARGS_EXTRA:=" + -DBZIP2_LIBRARIES=${PREFIX_NATIVE}/lib/libbz2.lib.a + -DENABLE_APPDATA:BOOL=ON + -DENABLE_BZIP2_COMPRESSION:BOOL=ON + -DENABLE_COMPLEX_DEPS:BOOL=ON + -DENABLE_COMPS:BOOL=ON + -DENABLE_LZMA_COMPRESSION:BOOL=ON + -DENABLE_RPMDB:BOOL=ON + -DENABLE_RPMDB_BYRPMHEADER:BOOL=ON + -DENABLE_RPMDB_LIBRPM:BOOL=ON + -DENABLE_RPMMD:BOOL=ON + -DENABLE_RPMPKG_LIBRPM:BOOL=ON + -DFEDORA=1 + -DLIBXML2_LIBRARIES=${PREFIX_NATIVE}/lib/libxml2.lib.a + -DLZMA_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLZMA_LIBRARY=${PREFIX_NATIVE}/lib/liblzma.lib.a + -DRPMIO_LIBRARY=${PREFIX_NATIVE}/lib/librpmio.so + -DWITH_LIBXML2:BOOL=ON + -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a +"}; : ${PKG_LIBSSH_DEPENDS:="libz"}; : ${PKG_LIBSSH_SHA256SUM:=acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718}; : ${PKG_LIBSSH_VERSION:=0.9.5}; : ${PKG_LIBSSH_URL:=https://www.libssh.org/files/${PKG_LIBSSH_VERSION%.*}/libssh-${PKG_LIBSSH_VERSION}.tar.xz}; : ${PKG_LIBSSH_SUBDIR:=libssh-${PKG_LIBSSH_VERSION}}; +: ${PKG_LIBSSH_CMAKE_ARGS_EXTRA:=" + -DWITH_EXAMPLES=OFF + -DWITH_GCRYPT=ON + -DWITH_SYMBOL_VERSIONING=OFF + -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.lib.a + +"}; : ${PKG_LIBSTROPHE_DEPENDS:="libressl expat"}; : ${PKG_LIBSTROPHE_SHA256SUM:=cf1a363ae6df88ccd97292d4e859b7680d8bac79347b53a9dc8f095456b7a02d}; : ${PKG_LIBSTROPHE_VERSION=0.10.1}; @@ -243,6 +278,22 @@ libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image : ${PKG_LIBZIP_SHA256SUM:=a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac}; : ${PKG_LIBZIP_VERSION:=1.7.1}; : ${PKG_LIBZIP_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_VERSION}.tar.xz}; +: ${PKG_LIBZIP_CMAKE_ARGS_EXTRA:=" + -DBZIP2_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DBZIP2_LIBRARIES=${PREFIX_NATIVE}/lib/libbz2.lib.a + -DENABLE_GNUTLS=:BOOL=ON + -DENABLE_MBEDTLS=:BOOL=OFF + -DGNUTLS_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DGNUTLS_LIBRARY=${PREFIX_NATIVE}/lib/libgnutls.lib.a + -DLIBLZMA_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLIBLZMA_LIBRARY=${PREFIX_NATIVE}/lib/liblzma.lib.a + -DNETTLE_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DNETTLE_LIBRARY=${PREFIX_NATIVE}/lib/libnettle.lib.a + -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 +"}; : ${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}; diff --git a/groups/800.minipix.group b/groups/800.minipix.group index d5da6268..d7470d7a 100644 --- a/groups/800.minipix.group +++ b/groups/800.minipix.group @@ -21,9 +21,6 @@ MINIPIX_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; MINIPIX_PKGLIST_DISABLE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; MINIPIX_RPM_DISABLE=1; -MINIPIX_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include"; -MINIPIX_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include"; -MINIPIX_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; # # 3rd party packages diff --git a/midipix.env b/midipix.env index 51f3d40c..f883cfa9 100644 --- a/midipix.env +++ b/midipix.env @@ -3,11 +3,12 @@ # characters in any of the variables below save for MAKEFLAGS, # PATH, and TIMESTAMP_FMT. # -# $PREFIX_{CROSS,NATIVE} and $WORKDIR must be immediately -# beneath $PREFIX. $PREFIX must be o+rwx. The variables mentioned -# should not be forward slash-terminated. +# ${PREFIX_{CROSS,MINGW32,MINIPIX,NATIVE,RPM}} and ${BUILD_WORKDIR} +# must be immediately beneath ${PREFIX}. ${PREFIX} must be o+rwx. +# The variables mentioned should not be forward slash-terminated. # +# # Build {step,variable}s DEFAULT_BUILD_STEPS=" \ fetch_clean fetch_download fetch_extract \ @@ -17,24 +18,24 @@ DEFAULT_BUILD_STEPS=" \ clean \ finish"; DEFAULT_BUILD_VARS=" \ - AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE \ - CC CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE \ - CFLAGS_CONFIGURE_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA \ + AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC 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 \ - 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_TARGET \ - INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \ - LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \ - MAKE_SUBDIRS MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA \ - MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA MAKEFLAGS_VERBOSITY \ - MIRRORS MIRRORS_GIT SOFORT_FORCE 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 NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ - PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX \ - RANLIB RPM_DISABLE SHA256SUM SUBDIR TARGET URL URLS_GIT VERSION"; + CONFIGURE_TYPE 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_TARGET INSTALL_TARGET_EXTRA \ + IN_TREE 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 NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ + PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX \ + 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 VERSION"; # # Prerequisite commands @@ -45,7 +46,8 @@ DEFAULT_PREREQS=" \ pgrep pkill printf readlink rm sed sha256sum sort \ stat tail tar test touch tr uniq wget xz zip"; -# Path names +# +# Path & variable names and URLs : ${PREFIX_ROOT:="${HOME}/midipix"}; : ${PREFIX:="${PREFIX_ROOT}/${ARCH}/${BUILD_KIND}"}; : ${PREFIX_CROSS:="${PREFIX}/${DEFAULT_TARGET}"}; @@ -88,7 +90,8 @@ https://midipix.lucioillanes.de/archives/ \ https://midipix.lucioillanes.de/repos_git/ \ "}; -# Default flags & variables +# +# Default toolchain flags & variables : ${DEFAULT_BUILD_CPUS:=}; : ${DEFAULT_BUILD_TYPE:=native}; : ${DEFAULT_CFLAGS_DEBUG:="-D_REDIR_TIME64=0 -g2 -O0"}; @@ -132,25 +135,18 @@ https://midipix.lucioillanes.de/repos_git/ \ : ${DEFAULT_LDFLAGS_HOST:=$(rtl_get_var_unsafe "DEFAULT_LDFLAGS_$(rtl_toupper "${BUILD_KIND}")_HOST")}; : ${DEFAULT_LDFLAGS_RUNTIME:=$(rtl_get_var_unsafe "DEFAULT_LDFLAGS_$(rtl_toupper "${BUILD_KIND}")_RUNTIME")}; -: ${DEFAULT_GITROOT:=git://midipix.org}; -: ${DEFAULT_GITROOT_HEAD:=git://midipix.org}; -: ${DEFAULT_MAKE_INSTALL_VNAME:=DESTDIR}; -: ${DEFAULT_MAKEFLAGS_BUILD:=-j${DEFAULT_BUILD_CPUS}}; -: ${DEFAULT_MAKEFLAGS_VERBOSITY:="V=99 VERBOSE=1"}; -: ${DEFAULT_GIT_ARGS:=""}; -: ${DEFAULT_TIMESTAMP_FMT:="%Y/%m/%d %H:%M:%S"}; -: ${DEFAULT_WGET_ARGS:="--no-check-certificate --timeout=25 --waitretry=16"}; -: ${DEFAULT_ZIPDIST_DEFROOT:="/dev/fs/c/midipix"}; - -# Target-relative defaults +# +# Target-relative toolchain defaults : ${DEFAULT_CROSS_AR:=${DEFAULT_TARGET}-ar}; : ${DEFAULT_CROSS_CC:=${DEFAULT_TARGET}-gcc}; +: ${DEFAULT_CROSS_CMAKE:=cmake}; : ${DEFAULT_CROSS_CXX:=${DEFAULT_TARGET}-g++}; : ${DEFAULT_CROSS_LIBTOOL:=slibtool}; : ${DEFAULT_CROSS_MAKE:=make}; : ${DEFAULT_CROSS_RANLIB:=${DEFAULT_TARGET}-ranlib}; : ${DEFAULT_HOST_AR:=ar}; : ${DEFAULT_HOST_CC:=gcc}; +: ${DEFAULT_HOST_CMAKE:=cmake}; : ${DEFAULT_HOST_CXX:=g++}; : ${DEFAULT_HOST_LIBTOOL:=slibtool}; : ${DEFAULT_HOST_MAKE:=make}; @@ -159,6 +155,7 @@ https://midipix.lucioillanes.de/repos_git/ \ : ${DEFAULT_HOST_RANLIB:=ranlib}; : ${DEFAULT_NATIVE_AR:=${DEFAULT_TARGET}-ar}; : ${DEFAULT_NATIVE_CC:=${DEFAULT_TARGET}-gcc}; +: ${DEFAULT_NATIVE_CMAKE:=cmake}; : ${DEFAULT_NATIVE_CXX:=${DEFAULT_TARGET}-g++}; : ${DEFAULT_NATIVE_LIBTOOL:=slibtool}; : ${DEFAULT_NATIVE_MAKE:=make}; @@ -166,6 +163,38 @@ https://midipix.lucioillanes.de/repos_git/ \ : ${DEFAULT_NATIVE_PKG_CONFIG_LIBDIR:=${PREFIX}/lib/pkgconfig}; : ${DEFAULT_NATIVE_RANLIB:=${DEFAULT_TARGET}-ranlib}; +# +# Default command & tool flags & variables +: ${DEFAULT_CMAKE_LISTFILE:="CMakeLists.txt"}; +: ${DEFAULT_GITROOT:=git://midipix.org}; +: ${DEFAULT_GITROOT_HEAD:=git://midipix.org}; +: ${DEFAULT_MAKE_INSTALL_VNAME:=DESTDIR}; +: ${DEFAULT_MAKEFLAGS_BUILD:=-j${DEFAULT_BUILD_CPUS}}; +: ${DEFAULT_MAKEFLAGS_VERBOSITY:="V=99 VERBOSE=1"}; +: ${DEFAULT_GIT_ARGS:=""}; +: ${DEFAULT_TIMESTAMP_FMT:="%Y/%m/%d %H:%M:%S"}; +: ${DEFAULT_WGET_ARGS:="--no-check-certificate --timeout=25 --waitretry=16"}; +: ${DEFAULT_ZIPDIST_DEFROOT:="/dev/fs/c/midipix"}; + +# +# Default CMake flags & variables +: ${DEFAULT_CMAKE_ARGS:=" + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY + -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER + -DCMAKE_INSTALL_PREFIX= + -DCMAKE_VERBOSE_MAKEFILE=YES"}; + +# +# Default sofort flags & variables +: ${DEFAULT_SOFORT_NATIVE_CC:="${DEFAULT_HOST_CC}"}; +: ${DEFAULT_SOFORT_NATIVE_CFLAGS:="-I${PREFIX}/include"}; +: ${DEFAULT_SOFORT_NATIVE_CXX:="${DEFAULT_HOST_CXX}"}; +: ${DEFAULT_SOFORT_NATIVE_CXXFLAGS:="-I${PREFIX}/include"}; +: ${DEFAULT_SOFORT_NATIVE_LD:="${DEFAULT_HOST_CC}"}; +: ${DEFAULT_SOFORT_NATIVE_LDFLAGS:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"}; + +# # Build {log,status} & tarball names : ${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME:=${BUILD_WORKDIR}/last_failed_pkg}; : ${DEFAULT_BUILD_LOG_FNAME:=${PREFIX}/build.log}; @@ -173,6 +202,7 @@ https://midipix.lucioillanes.de/repos_git/ \ : ${DEFAULT_BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS}; : ${DEFAULT_ZIPDIST_FNAME_PREFIX:=midipix-${ARCH}-${BUILD_KIND}.}; +# # GNU autotools cache : ${DEFAULT_CONFIG_CACHE:=" ac_cv_buggy_getaddrinfo=no diff --git a/subr.rtl/rtl_complex.subr b/subr.rtl/rtl_complex.subr index 61637f69..f315fd90 100644 --- a/subr.rtl/rtl_complex.subr +++ b/subr.rtl/rtl_complex.subr @@ -4,15 +4,15 @@ rtl_export_vars() { local _unsetfl=0; [ "x${1}" = "x-u" ] && { _unsetfl=1; shift; }; + while [ "${#}" -ge 2 ]; do - if [ -n "${2}" ]; then - if [ "${_unsetfl:-0}" -eq 0 ]; then - rtl_set_var_unsafe "${1}" "${2}"; export "${1}"; - else - unset "${1}"; - fi; - fi; - shift 2; + if [ "${2:+1}" = 1 ]\ + || [ "${_unsetfl}" -eq 1 ]; then + case "${_unsetfl}" in + 0) rtl_set_var_unsafe "${1}" "${2}"; export "${1}"; ;; + 1) unset "${1}"; ;; + esac; + fi; shift 2; done; }; diff --git a/subr.rtl/rtl_platform.subr b/subr.rtl/rtl_platform.subr index c8137e56..ac411c87 100644 --- a/subr.rtl/rtl_platform.subr +++ b/subr.rtl/rtl_platform.subr @@ -108,17 +108,17 @@ rtl_run_cmd_unsplit() { rtl_set_vars() { local _vars_set_vname="${1}" _vname_dst="${2}" _vname_src_tmpls="${3}" \ _vars_set_old="" _vars_set_tmp="" _vname_src=""; + for _vname_src in $(rtl_toupper "${_vname_src_tmpls}"); do _vname_src="${_vname_src}_${_vname_dst}"; - _vval_src="$(rtl_get_var_unsafe "${_vname_src}")"; - if [ -n "${_vval_src}" ]; then - rtl_set_var_unsafe "PKG_${_vname_dst}" "${_vval_src}"; - _vars_set_tmp="$(rtl_lconcat "${_vars_set_tmp}" "PKG_${_vname_dst}")"; + eval _vval_src='${'"${_vname_src}"':-}'; + if [ "${_vval_src:+1}" = 1 ]; then + eval PKG_${_vname_dst}='${_vval_src}'; + _vars_set_tmp="${_vars_set_tmp:+${_vars_set_tmp} }PKG_${_vname_dst}"; fi; done; - _vars_set_old="$(rtl_get_var_unsafe "${_vars_set_vname}")"; - rtl_set_var_unsafe "${_vars_set_vname}" \ - "$(rtl_lconcat "${_vars_set_old}" "${_vars_set_tmp}")"; + eval _vars_set_old='${'"${_vars_set_vname}"'}'; + rtl_set_var_unsafe "${_vars_set_vname}" "${_vars_set_old:+${_vars_set_old} }${_vars_set_tmp}"; }; # vim:filetype=sh diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index 5048c939..c7d40dce 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -61,8 +61,10 @@ exp_pkg_env_defaults() { # Return: zero (0) on success, non-zero (>0) on failure # exp_pkg_env_set() { - local _build_vars_default="${1}" _group_name="${2}" _nounset="${3}"\ - _pkg_name="${4}" _var_prefixes="" _vars_set="" _vname="" IFS IFS0; + local _build_vars_default="${1}" _group_name="${2}" _nounset="${3}" \ + _pkg_name="${4}" _cmd_name="" _var_prefixes="" _vars_set="" \ + _vname="" IFS IFS0; + rtl_set_vars _vars_set BUILD_TYPE "DEFAULT ${_group_name} PKG_${_pkg_name}"; rtl_set_vars _vars_set INHERIT_FROM "PKG_${_pkg_name}"; _var_prefixes="$(rtl_toupper "DEFAULT DEFAULT_${PKG_BUILD_TYPE} ${_group_name}")"; @@ -85,48 +87,13 @@ exp_pkg_env_set() { "$(set | sed -ne '/^PKG_[^=]*=/s/=.*$//p' | paste -s -d " ")" \ "${_vars_set}"); fi; -}; -ex_pkg_env_sofort() { - local _pkg_base_dir="${1}" _pkg_sofort_force="${2}" _pkg_subdir="${3}" \ - _vname="" _vname_new="" _vval="" _vval_old=""; - - if [ -d "${_pkg_base_dir}/${_pkg_subdir}/sofort" ] \ - || [ "${_pkg_sofort_force:-0}" -eq 1 ]; then - for _vname in \ - PKG_SOFORT_NATIVE_CC \ - PKG_SOFORT_NATIVE_CFLAGS \ - PKG_SOFORT_NATIVE_CXX \ - PKG_SOFORT_NATIVE_CXXFLAGS \ - PKG_SOFORT_NATIVE_LD \ - PKG_SOFORT_NATIVE_LDFLAGS; do - _vname_new="PKG_${_vname#PKG_SOFORT_}"; - rtl_set_var_unsafe "${_vname_new}" ""; - done; - for _vname in \ - PKG_SOFORT_NATIVE_CC \ - PKG_SOFORT_NATIVE_CFLAGS \ - PKG_SOFORT_NATIVE_CFLAGS_EXTRA \ - PKG_SOFORT_NATIVE_CXX \ - PKG_SOFORT_NATIVE_CXXFLAGS \ - PKG_SOFORT_NATIVE_CXXFLAGS_EXTRA \ - PKG_SOFORT_NATIVE_LD \ - PKG_SOFORT_NATIVE_LDFLAGS \ - PKG_SOFORT_NATIVE_LDFLAGS_EXTRA; do - if _vval="$(rtl_get_var_unsafe "${_vname}")" \ - && [ -n "${_vval}" ]; then - _vname_new="${_vname#PKG_SOFORT_}"; - case "${_vname}" in - *_EXTRA) - _vval_old="$(rtl_get_var_unsafe "${_vname_new%_EXTRA}")"; - rtl_set_var_unsafe "${_vname_new%_EXTRA}" "${_vval_old:+${_vval_old} }${_vval}"; ;; - *) - rtl_set_var_unsafe "${_vname_new}" "${_vval}"; ;; - esac; - export "${_vname_new}"; - fi; - done; - fi; return 0; + for _vname in AR CC CXX PKG_CONFIG RANLIB; do + if eval [ '"${PKG_'"${_vname}"':+1}"' = 1 ]\ + && eval [ '"${PKG_'"${_vname}"'#/}"' = '"${_cmd_name:=${PKG_'"${_vname}"'}}"' ]; then + eval PKG_${_vname}='$(which "${_cmd_name}")'; + fi; _cmd_name=""; + done; }; # @@ -146,8 +113,7 @@ ex_pkg_env() { _nounset="${4}" _pkg_name="${5}" _restart_at="${6}" _workdir="${7}" _vname=""; rtl_fileop source_opt "vars/${_pkg_name}.vars" "${_group_name}/${_pkg_name}.${_group_name}"; if ! exp_pkg_env_set "${_build_vars_default}" "${_group_name}" "${_nounset}" "${_pkg_name}"\ - || ! exp_pkg_env_defaults "${_build_steps_default}" "${_pkg_name}" "${_workdir}"\ - || ! ex_pkg_env_sofort "${PKG_BASE_DIR:-}" "${PKG_SOFORT_FORCE:-0}" "${PKG_SUBDIR:-}"; then + || ! exp_pkg_env_defaults "${_build_steps_default}" "${_pkg_name}" "${_workdir}"; then return 1; fi; }; diff --git a/subr/ex_pkg_restart.subr b/subr/ex_pkg_restart.subr index b45851f2..d6f2bee5 100644 --- a/subr/ex_pkg_restart.subr +++ b/subr/ex_pkg_restart.subr @@ -280,8 +280,7 @@ ex_pkg_process_restart_spec() { if [ "${_epprs_step}" = "${_epprs_step1}" ]; then eval ${_epprs_rspec_at}='${'"${_epprs_rspec_at}"':+${'"${_epprs_rspec_at}"'},}finish'; fi; - fi; - eval echo '${'"${_epprs_rspec}"'}'; ;; + fi; ;; esac; rtl_llift3 "${_epprs_rspec}" "," " " || _epprs_rc=1; else _epprs_rc=1; diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index c57b342b..ea265076 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -2,19 +2,27 @@ # set +o errexit -o noglob -o nounset is assumed. # -pkg_configure() { +pkgp_configure_autotools() { local _libtool="" _rc=0; - if [ -x "${PKG_CONFIGURE:-}" ]; then + + if ! [ -x "${PKG_CONFIGURE:-}" ]; then + return 2; + elif [ -d "${PKG_BASE_DIR}/${PKG_SUBDIR}/sofort" ]\ + || [ "${PKG_CONFIGURE_TYPE:-}" = "sofort" ]; then + return 2; + else case "${PKG_LIBTOOL:-}" in "") _libtool=""; ;; none) _libtool=""; ;; *) _libtool="${PKG_LIBTOOL}"; ;; esac; - rtl_export_vars \ + + rtl_export_vars \ PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ PYTHON "${PKG_PYTHON:-}" \ ${_libtool:+MAKE} ${_libtool:+"make LIBTOOL=${_libtool}"}; + AR="${PKG_AR}" \ CC="${PKG_CC}" \ RANLIB="${PKG_RANLIB}" \ @@ -23,8 +31,9 @@ pkg_configure() { CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE:-}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \ LDFLAGS="${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \ "${PKG_CONFIGURE}" ${PKG_CONFIGURE_ARGS:-} ${PKG_CONFIGURE_ARGS_EXTRA:-} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG:-}; - _rc="${?}" - rtl_export_vars -u \ + _rc=$((${?} ? 1 : ${_rc})); + + rtl_export_vars -u \ PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ PYTHON "${PKG_PYTHON:-}" \ @@ -33,4 +42,143 @@ pkg_configure() { fi; }; -# vim:filetype=sh +pkgp_configure_cmake() { + local _cmake_args_auto"" _build_type="" _IFS0="${IFS:- }" _rc=0 IFS; + + if [ "${PKG_CMAKE_LISTFILE:+1}" != 1 ]\ + || ! [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/${PKG_CMAKE_LISTFILE}" ]; then + _rc=2; + else + rtl_fileop rm config.cache || return 1; + rtl_export_vars \ + PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ + PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ + PYTHON "${PKG_PYTHON:-}"; + + case "${BUILD_KIND}" in + debug) _build_type="debug"; ;; + release|*) _build_type="release"; ;; + esac; + + _cmake_args_auto=" + -DCMAKE_AR=${PKG_AR} + -DCMAKE_BUILD_TYPE=${_build_type} + -DCMAKE_C_COMPILER=${PKG_CC} + -DCMAKE_C_FLAGS=${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}} + -DCMAKE_CPP_FLAGS=${PKG_CPPFLAGS_CONFIGURE:-}${PKG_CPPFLAGS_CONFIGURE_EXTRA:+ ${PKG_CPPFLAGS_CONFIGURE_EXTRA}} + -DCMAKE_CXX_COMPILER=${PKG_CXX} + -DCMAKE_CXX_FLAGS=${PKG_CXXFLAGS_CONFIGURE:-}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}} + -DCMAKE_EXE_LINKER_FLAGS=${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}} + -DCMAKE_FIND_ROOT_PATH=${PKG_PREFIX} + -DCMAKE_INSTALL_PREFIX= + -DCMAKE_LINKER=$(which "ld") + -DCMAKE_MODULE_LINKER_FLAGS=${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}} + -DCMAKE_RANLIB=${PKG_RANLIB} + -DCMAKE_SHARED_LINKER_FLAGS=${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}} + -DPKG_CONFIG_EXECUTABLE=${PKG_PKG_CONFIG}" || return 1; + + case "${PKG_BUILD_TYPE}" in + host|cross) + ;; + native) + _cmake_args_auto="${_cmake_args_auto:+${_cmake_args_auto}} + -DCMAKE_LINKER=$(which "${PKG_TARGET}-ld") + -DCMAKE_SYSROOT=${PKG_PREFIX} + -DCMAKE_SYSTEM_NAME=Midipix" || return 1; + + case "${ARCH}" in + nt32) _cmake_args_auto="${_cmake_args_auto:+${_cmake_args_auto}} + -DCMAKE_SYSTEM_PROCESSOR=i686"; ;; + nt64) _cmake_args_auto="${_cmake_args_auto:+${_cmake_args_auto}} + -DCMAKE_SYSTEM_PROCESSOR=x86_64"; ;; + esac; ;; + esac; + + IFS=" + "; "${PKG_CMAKE}" \ + ${_cmake_args_auto} \ + ${PKG_CMAKE_ARGS:-} \ + ${PKG_CMAKE_ARGS_EXTRA:-} \ + "${PKG_BASE_DIR}/${PKG_SUBDIR}"; + _rc=$((${?} ? ${?} : ${_rc})); IFS="${_IFS0}"; + + rtl_export_vars -u \ + PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ + PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ + PYTHON "${PKG_PYTHON:-}"; + fi; + return "${_rc}"; +}; + +pkgp_configure_sofort() { + local _rc=0 _vname="" _vnames="" _vval=""; + + if ! [ -x "${PKG_CONFIGURE:-}" ]; then + return 2; + elif ! [ -d "${PKG_BASE_DIR}/${PKG_SUBDIR}/sofort" ]\ + && ! [ "${PKG_CONFIGURE_TYPE:-}" = "sofort" ]; then + return 2; + else + for _vname in AR CC CXX LD RANLIB; do + if eval [ '"${PKG_'"${_vname}"':+1}"' = 1 ]; then + _vnames="${_vnames:+${_vnames} }${_vname}"; + eval ${_vname}='${PKG_'"${_vname}"'}'; export ${_vname}; + fi; + if eval [ '"${PKG_SOFORT_NATIVE_'"${_vname}"':+1}"' = 1 ]; then + _vnames="${_vnames:+${_vnames} }NATIVE_${_vname}"; + eval NATIVE_${_vname}='${PKG_SOFORT_NATIVE_'"${_vname}"'}'; export NATIVE_${_vname}; + fi; + done; + for _vname in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS; do + if eval [ '"${PKG_'"${_vname}"'_CONFIGURE:+1}"' = 1 ]; then + eval _vval='${PKG_'"${_vname}"'_CONFIGURE}'; + if eval [ '"${PKG_'"${_vname}"'_CONFIGURE_EXTRA:+1}"' = 1 ]; then + eval _vval='${_vval:+${_vval} }${PKG_'"${_vname}"'_CONFIGURE_EXTRA}'; + fi; + _vnames="${_vnames:+${_vnames} }${_vname} ${_vname}_SHARED ${_vname}_STATIC"; + eval ${_vname}='${_vval}'\; ${_vname}_SHARED='${_vval}'\; ${_vname}_STATIC='${_vval}'; + export ${_vname} ${_vname}_SHARED ${_vname}_STATIC; + fi; + if eval [ '"${PKG_SOFORT_NATIVE_'"${_vname}"':+1}"' = 1 ]; then + eval _vval='${PKG_SOFORT_NATIVE_'"${_vname}"'}'; + if eval [ '"${PKG_SOFORT_NATIVE_'"${_vname}"'_EXTRA:+1}"' = 1 ]; then + eval _vval='${_vval:+${_vval} }${PKG_SOFORT_NATIVE_'"${_vname}"'_EXTRA}'; + fi; + _vnames="${_vnames:+${_vnames} }NATIVE_${_vname}"; + eval NATIVE_${_vname}='${_vval}'; export NATIVE_${_vname}; + fi; + done; + + RANLIB="${PKG_RANLIB}" \ + "${PKG_CONFIGURE}" \ + ${PKG_CONFIGURE_ARGS:-} \ + ${PKG_CONFIGURE_ARGS_EXTRA:-} \ + ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG:-}; + _rc=$((${?} ? 1 : ${_rc})); + + for _vname in ${_vnames}; do + unset "${_vname}"; + done; + return "${_rc}"; + fi; +}; + +pkg_configure() { + local _rc=0 _type=""; + + for _type in autotools sofort cmake; do + if [ "${PKG_CONFIGURE_TYPE:+1}" = 1 ]\ + && [ "${PKG_CONFIGURE_TYPE}" != "${_type}" ]; then + continue; + else + pkgp_configure_${_type} "${@}"; _rc="${?}"; + case "${_rc}" in + 0|1) return "${_rc}"; ;; + 2) _rc=0; continue; ;; + esac; + fi; + done; + return "${_rc}"; +}; + +# vim:filetype=sh textwidth=0 diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 421be28b..c91a08a3 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -4,7 +4,12 @@ pkg_configure_autotools() { local _config_cache="" _fname="" _subdir_tgt=""; - ex_pkg_env_sofort "${PKG_BASE_DIR}" "${PKG_SOFORT_FORCE:-0}" "${PKG_SUBDIR:-}"; + + if [ "${PKG_CONFIGURE_TYPE:+1}" = 1 ]\ + && [ "${PKG_CONFIGURE_TYPE}" != "autotools" ]; then + return 0; + fi; + if rtl_exists_any "${PKG_BASE_DIR}/${PKG_SUBDIR}" \ "config.guess" "configure.ac" "configure.in" "configure"; then rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"; diff --git a/subr/pkg_fetch_clean.subr b/subr/pkg_fetch_clean.subr index a56196cb..52797068 100644 --- a/subr/pkg_fetch_clean.subr +++ b/subr/pkg_fetch_clean.subr @@ -8,7 +8,7 @@ pkg_fetch_clean() { if [ -n "${PKG_URLS_GIT:-}" ]; then if [ -n "${PKG_SUBDIR:-}" ]\ && [ "${PKG_SUBDIR}" != "${PKG_URLS_GIT%%=*}" ]; then - rtl_fileopm rm "${PKG_SUBDIR}"; + rtl_fileop rm "${PKG_SUBDIR}"; fi; for _dname in ${PKG_URLS_GIT}; do _dname="${_dname%%=*}"; rtl_fileop rm "${_dname}"; diff --git a/vars/clang_host.vars b/vars/clang_host.vars deleted file mode 100644 index b9909276..00000000 --- a/vars/clang_host.vars +++ /dev/null @@ -1,27 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_clang_host_configure() { - if ! rtl_fileop rm "../cfe-${PKG_VERSION}-host" \ - || ! rtl_fileop mkdir "../cfe-${PKG_VERSION}-host" \ - || ! rtl_fileop cd "../cfe-${PKG_VERSION}-host" \ - || ! rtl_log_msg verbose "Bootstrapping clang_host..." \ - || ! ("${PREFIX}/bin/cmake" \ - "../cfe-${PKG_VERSION}.src" \ - -DCLANG_BUILD_EXAMPLES:BOOL=OFF \ - -DCLANG_INCLUDE_DOCS:BOOL=OFF \ - -DCLANG_INCLUDE_TESTS:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_VERBOSE_MAKEFILE=NO \ - -DLIBCLANG_BUILD_STATIC:BOOL=ON \ - -DLLVM_PREFIX="${PKG_PREFIX}" \ - -G "Unix Makefiles" \ - -Wno-dev) \ - || ! rtl_log_msg verbose "Finished bootstrapping clang_host."; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/cmake.vars b/vars/cmake.vars deleted file mode 100644 index df190732..00000000 --- a/vars/cmake.vars +++ /dev/null @@ -1,63 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_cmake_configure() { - if ! rtl_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \ - "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/Midipix.cmake" \ - || ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - || ! cmake -DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.a" \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_INSTALL_PREFIX= \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DCMAKE_SYSTEM_NAME=Midipix \ - -DCMAKE_USE_SYSTEM_BZIP2=ON \ - -DCMAKE_USE_SYSTEM_CURL=ON \ - -DCMAKE_USE_SYSTEM_EXPAT=OFF \ - -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON \ - -DCMAKE_USE_SYSTEM_LIBUV=ON \ - -DCMAKE_USE_SYSTEM_ZLIB=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCURL_INCLUDE_DIR="${PKG_PREFIX}/include/curl" \ - -DCURL_LIBRARY="${PKG_PREFIX}/lib/libcurl.lib.a" \ - -DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.lib.a" \ - -DKWSYS_LFS_WORKS=YES \ - -DLibArchive_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLibArchive_LIBRARY="${PKG_PREFIX}/lib/libarchive.lib.a" \ - -DLIBLZMA_HAS_AUTO_DECODER=YES \ - -DLIBLZMA_HAS_EASY_ENCODER=YES \ - -DLIBLZMA_HAS_LZMA_PRESET=YES \ - -DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ - -DLibUV_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLibUV_LIBRARY="${PKG_PREFIX}/lib/libuv.1.0.0.lib.a" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ - "../cmake-${PKG_VERSION}"; then - return 1; - fi; -}; - -pkg_cmake_install_make_pre() { - if [ ! -e cmake_install.cmake.orig ]; then - sed -i.orig '/^\s*set(CMAKE_INSTALL_PREFIX ".*")$/s/".*"/""/' \ - cmake_install.cmake; - fi; -}; - -pkg_cmake_host_configure() { - if ! rtl_fileop rm config.cache \ - || ! cmake -DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.so" "../cmake-${PKG_VERSION}"; then - return 1; - fi; -}; - -pkg_cmake_host_install_make_pre() { - pkg_cmake_install_make_pre; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/cmake_host.vars b/vars/cmake_host.vars deleted file mode 120000 index e380d15f..00000000 --- a/vars/cmake_host.vars +++ /dev/null @@ -1 +0,0 @@ -cmake.vars
\ No newline at end of file diff --git a/vars/libjpeg_turbo.vars b/vars/libjpeg_turbo.vars deleted file mode 100644 index e89baf78..00000000 --- a/vars/libjpeg_turbo.vars +++ /dev/null @@ -1,24 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_libjpeg_turbo_configure() { - if ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_ASM_NASM_COMPILER="${PREFIX}/bin/${PKG_TARGET}-nasm" \ - -DCMAKE_ASM_NASM_OBJECT_FORMAT="win64" \ - -DCMAKE_BUILD_TYPE="Debug" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DWITH_JPEG8="ON" \ - -DWITH_SIMD="OFF" \ - "../libjpeg-turbo-${PKG_VERSION}"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/libsolv.vars b/vars/libsolv.vars deleted file mode 100644 index da68e758..00000000 --- a/vars/libsolv.vars +++ /dev/null @@ -1,41 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_libsolv_configure() { - if ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - cmake -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a" \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ - -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DENABLE_APPDATA:BOOL="ON" \ - -DENABLE_BZIP2_COMPRESSION:BOOL="ON" \ - -DENABLE_COMPLEX_DEPS:BOOL="ON" \ - -DENABLE_COMPS:BOOL="ON" \ - -DENABLE_LZMA_COMPRESSION:BOOL="ON" \ - -DENABLE_RPMDB:BOOL="ON" \ - -DENABLE_RPMDB_BYRPMHEADER:BOOL="ON" \ - -DENABLE_RPMDB_LIBRPM:BOOL="ON" \ - -DENABLE_RPMMD:BOOL="ON" \ - -DENABLE_RPMPKG_LIBRPM:BOOL="ON" \ - -DFEDORA="1" \ - -DLIBXML2_LIBRARIES="${PKG_PREFIX}/lib/libxml2.lib.a" \ - -DLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ - -DRPMIO_LIBRARY="${PKG_PREFIX}/lib/librpmio.so" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ - -DWITH_LIBXML2:BOOL="ON" \ - "../libsolv-${PKG_VERSION}"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/libssh.vars b/vars/libssh.vars deleted file mode 100644 index 58837728..00000000 --- a/vars/libssh.vars +++ /dev/null @@ -1,27 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_libssh_configure() { - if ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ - -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.lib.a" \ - -DWITH_SYMBOL_VERSIONING=OFF \ - -DWITH_GCRYPT=ON \ - -DWITH_EXAMPLES=OFF \ - -DPKG_CONFIG_EXECUTABLE=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config \ - "../libssh-${PKG_VERSION}"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/libzip.vars b/vars/libzip.vars deleted file mode 100644 index 5f6b4fef..00000000 --- a/vars/libzip.vars +++ /dev/null @@ -1,63 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_libzip_configure() { - local _build_type=""; - case "${BUILD_KIND}" in - debug) _build_type="Debug"; ;; - release) _build_type="Release"; ;; - *) exit 1; ;; - esac; - if ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" LDFLAGS="-lbz2" PREFIX="" \ - cmake -DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a" \ - -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_BUILD_TYPE="${_build_type}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lfts" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_INSTALL_PREFIX= \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DCMAKE_SYSTEM_NAME="Midipix" \ - -DENABLE_GNUTLS=:BOOL=ON \ - -DENABLE_MBEDTLS=:BOOL=OFF \ - -DGNUTLS_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DGNUTLS_LIBRARY="${PKG_PREFIX}/lib/libgnutls.lib.a" \ - -DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ - -DNETTLE_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DNETTLE_LIBRARY="${PKG_PREFIX}/lib/libnettle.lib.a" \ - -DOPENSSL_CRYPTO_LIBRARY="${PKG_PREFIX}/lib/libcrypto.lib.a" \ - -DOPENSSL_SSL_LIBRARY="${PKG_PREFIX}/lib/libssl.lib.a" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ - "../libzip-${PKG_VERSION}"; then - return 1; - fi; -}; - -pkg_libzip_host_configure() { - local _build_type=""; - case "${BUILD_KIND}" in - debug) _build_type="Debug"; ;; - release) _build_type="Release"; ;; - *) exit 1; ;; - esac; - if ! rtl_fileop rm config.cache \ - || ! env LDFLAGS="-L${PKG_PREFIX}/lib -lbz2 -lfts -lssl" PREFIX="" \ - cmake -DCMAKE_BUILD_TYPE="${_build_type}" \ - -DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lcrypto -lfts" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_INSTALL_PREFIX= \ - -DENABLE_GNUTLS=:BOOL=OFF \ - -DENABLE_MBEDTLS=:BOOL=OFF \ - "../libzip-${PKG_VERSION}"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/libzip_host.vars b/vars/libzip_host.vars deleted file mode 120000 index 8582365b..00000000 --- a/vars/libzip_host.vars +++ /dev/null @@ -1 +0,0 @@ -libzip.vars
\ No newline at end of file diff --git a/vars/llvm_host.vars b/vars/llvm_host.vars deleted file mode 100644 index 82903743..00000000 --- a/vars/llvm_host.vars +++ /dev/null @@ -1,28 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_llvm_host_configure() { - if ! rtl_fileop rm "../llvm-${PKG_VERSION}-host" \ - || ! rtl_fileop mkdir "../llvm-${PKG_VERSION}-host" \ - || ! rtl_fileop cd "../llvm-${PKG_VERSION}-host" \ - || ! rtl_log_msg verbose "Bootstrapping llvm_host..." \ - || ! ("${PREFIX}/bin/cmake" \ - "../llvm-${PKG_VERSION}.src" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_VERBOSE_MAKEFILE=NO \ - -DLLVM_BUILD_DOCS=NO \ - -DLLVM_BUILD_EXAMPLES=NO \ - -DLLVM_BUILD_TESTS=NO \ - -DLLVM_ENABLE_SPHINX=NO \ - -DLLVM_TARGETS_TO_BUILD=X86 \ - -DSPHINX_WARNINGS_AS_ERRORS=NO \ - -G "Unix Makefiles" \ - -Wno-dev) \ - || ! rtl_log_msg verbose "Finished bootstrapping llvm_host."; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/lolcode.vars b/vars/lolcode.vars deleted file mode 100644 index f610063c..00000000 --- a/vars/lolcode.vars +++ /dev/null @@ -1,19 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_lolcode_configure() { - if ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ - -DCMAKE_INSTALL_PREFIX="" \ - "../lci"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/minizip.vars b/vars/minizip.vars deleted file mode 100644 index c6ac3f0f..00000000 --- a/vars/minizip.vars +++ /dev/null @@ -1,31 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_minizip_configure() { - if ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_BUILD_TYPE="Debug" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_CXX}" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DPKG_CONFIG_EXECUTABLE="${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libz.lib.a" \ - -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a" \ - -DMZ_OPENSSL=ON \ - -DMZ_ZSTD=OFF \ - -DMZ_LZMA=ON \ - -DMZ_LIBBSD=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DMZ_BUILD_TEST=ON \ - "../${PKG_SUBDIR}"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/openjpeg.vars b/vars/openjpeg.vars deleted file mode 100644 index cfca5e25..00000000 --- a/vars/openjpeg.vars +++ /dev/null @@ -1,33 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_openjpeg_configure() { - if ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ - -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DLCMS2_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLCMS2_LIBRARY="${PKG_PREFIX}/lib/liblcms2.lib.a" \ - -DPNG_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libpng.lib.a" \ - -DPNG_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libpng.lib.a" \ - -DPNG_PNG_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DTIFF_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DTIFF_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libtiff.lib.a" \ - -DTIFF_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libtiff.lib.a" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY_DEBUG="${PKG_PREFIX}/lib/libz.a" \ - -DZLIB_LIBRARY_RELEASE="${PKG_PREFIX}/lib/libz.a" \ - "../openjpeg-${PKG_VERSION}"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/tdnf.vars b/vars/tdnf.vars deleted file mode 100644 index c95150c4..00000000 --- a/vars/tdnf.vars +++ /dev/null @@ -1,31 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_tdnf_configure() { - local _rc=0; - rtl_export_vars \ - PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ - PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"; - if ! rtl_fileop rm config.cache \ - || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ - -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DOPENSSL_LIBRARY="${PKG_PREFIX}/lib/libcrypto.so" \ - "../tdnf-${PKG_VERSION}"; then - _rc=1; - fi; - rtl_export_vars -u \ - PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ - PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"; - return "${_rc}"; -}; - -# vim:filetype=sh textwidth=0 diff --git a/vars/xpdf.vars b/vars/xpdf.vars deleted file mode 100644 index 209aab95..00000000 --- a/vars/xpdf.vars +++ /dev/null @@ -1,25 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_xpdf_configure() { - if ! rtl_fileop rm config.cache \ - || ! env CXX_FLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \ - cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \ - -DCMAKE_BUILD_TYPE="Debug" \ - -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \ - -DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_CXX}" \ - -DCMAKE_SYSROOT=${PREFIX_NATIVE} \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \ - -DFREETYPE_LIBRARY=${PREFIX_NATIVE}/lib/libfreetype.lib.a \ - -DFREETYPE_INCLUDE_DIR_ft2build={PREFIX_NATIVE}/include/ft2build \ - -DFONTCONFIG_LIBRARY=${PREFIX_NATIVE}/lib/libfontconfig.lib.a \ - "../xpdf-${PKG_VERSION}"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 |