commit 6cb6c4aa6115e9b023a53e27cb9793d407c622a6 Author: Juergen Daubert <jue@jue.li> Date: Mon Dec 19 15:17:52 2022 +0100 libarchive: build with autotools again diff --git a/libarchive/.footprint b/libarchive/.footprint index a2632ae1..c7f04d82 100644 --- a/libarchive/.footprint +++ b/libarchive/.footprint @@ -8,8 +8,10 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/archive_entry.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libarchive.a -lrwxrwxrwx root/root usr/lib/libarchive.so -> libarchive.so.19 --rwxr-xr-x root/root usr/lib/libarchive.so.19 +-rwxr-xr-x root/root usr/lib/libarchive.la +lrwxrwxrwx root/root usr/lib/libarchive.so -> libarchive.so.13.6.2 +lrwxrwxrwx root/root usr/lib/libarchive.so.13 -> libarchive.so.13.6.2 +-rwxr-xr-x root/root usr/lib/libarchive.so.13.6.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libarchive.pc drwxr-xr-x root/root usr/share/ diff --git a/libarchive/.signature b/libarchive/.signature index c60d60c5..cf487d34 100644 --- a/libarchive/.signature +++ b/libarchive/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqiKpRG5TGEGICNfsi1L7gizf10A2dEAYSE5e8s3AS2L61xSPSbGGSb3utVwScuN1EGfoNck/l9soF/6qAjec1Qw= -SHA256 (Pkgfile) = 1cf6f77d9673b8ef22151ed58a87900ccf5a49239e6dd50016f03166c306488e -SHA256 (.footprint) = 1025bef03ed5fea3c3428ebd022d5e2ae4974a2ebf6b711d564f4233160431ee +RWRJc1FUaeVeqiGms53zuIZF04q4D6/B+oe04BE8cjwfhTiQ0frMkH7R0PqDeHLdI3PgkruzpjTbDaXrMj6jeuoYoSsjpJ7Zrwk= +SHA256 (Pkgfile) = 329ee97b63c858b950068448d899847f090fa2a23905c97d653d4bada8d013ef +SHA256 (.footprint) = 4657ae77d65c936340a13fe44364b76415797a9dd258d7ba2b6798923f9ab2c8 SHA256 (libarchive-3.6.2.tar.xz) = 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile index b0379467..c2a17d06 100644 --- a/libarchive/Pkgfile +++ b/libarchive/Pkgfile @@ -5,21 +5,24 @@ name=libarchive version=3.6.2 -release=1 +release=2 source=(https://github.com/libarchive/libarchive/releases/download/v$version/$name-$...) build() { - # We're passing ENABLE_LIBB2, ENABLE_LIBXML2 and ENABLE_NETTLE = OFF + cd $name-$version + + # We're passing --without-xml2, --without-nettle and --without-libb2 # to avoid linking to libraries which are only available in opt. - cmake -S $name-$version -B build -G Ninja \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ - -D ENABLE_LIBB2=OFF \ - -D ENABLE_LIBXML2=OFF \ - -D ENABLE_NETTLE=OFF \ - -Wno-dev - cmake --build build - DESTDIR=$PKG cmake --install build + ./configure \ + --prefix=/usr \ + --without-xml2 \ + --without-nettle \ + --without-libb2 + + make + make DESTDIR=$PKG install + + # fix pkgconfig file + sed "/^Requires.private:/s/iconv//" -i $PKG/usr/lib/pkgconfig/libarchive.pc }