diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-01 21:09:37 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-01 21:09:37 +0000 |
| commit | bf9edfaed49c4387e181be454602e0cc65fe4382 (patch) | |
| tree | 2bf582d4f1f0916946bc2285014b193482c52d86 /vars/libsolv.vars | |
| parent | 725770754d9f53d5b41d876053a7a993b629472e (diff) | |
| download | midipix_build-bf9edfaed49c4387e181be454602e0cc65fe4382.tar.bz2 midipix_build-bf9edfaed49c4387e181be454602e0cc65fe4382.tar.xz | |
General cleanup, pt. III.
dist/dist_digest.dist: removes obsolete dist file.
etc/{build.usage,README.md}: updated.
groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group.
groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group.
groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set.
groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set.
groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set.
groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set.
midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF.
subr/rtl_fileop.subr: adds ch{mod,own} fileops.
vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file.
Diffstat (limited to 'vars/libsolv.vars')
| -rw-r--r-- | vars/libsolv.vars | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/vars/libsolv.vars b/vars/libsolv.vars index e3be2cbc..494b0ade 100644 --- a/vars/libsolv.vars +++ b/vars/libsolv.vars @@ -3,37 +3,38 @@ # pkg_libsolv_configure() { - rm -f config.cache; - env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ - PREFIX="" \ - cmake -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ - -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}" \ - -DFEDORA=1 \ - -DWITH_LIBXML2:BOOL=ON \ - -DENABLE_COMPLEX_DEPS:BOOL=ON \ - -DENABLE_RPMDB_BYRPMHEADER:BOOL=ON \ - -DENABLE_RPMDB_LIBRPM:BOOL=ON \ - -DENABLE_RPMPKG_LIBRPM:BOOL=ON \ - -DENABLE_LZMA_COMPRESSION:BOOL=ON \ - -DENABLE_BZIP2_COMPRESSION:BOOL=ON \ - -DENABLE_COMPS:BOOL=ON \ - -DENABLE_APPDATA:BOOL=ON \ - -DENABLE_RPMDB:BOOL=ON \ - -DENABLE_RPMMD:BOOL=ON \ - -DLIBXML2_LIBRARIES="${PKG_PREFIX}/lib/libxml2.lib.a" \ - -DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a" \ - -DLZMA_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a" \ - -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ - -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ - "../libsolv-${PKG_VERSION}"; + 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" \ + -DWITH_LIBXML2:BOOL="ON" \ + -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ + -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ + "../libsolv-${PKG_VERSION}"; then + return 1; + fi; }; -# vim:filetype=sh +# vim:filetype=sh textwidth=0 |