From 2f767b672a1dcef3712c9513b143b3b39d5eb9dc Mon Sep 17 00:00:00 2001 From: Danny Rawlins <monster.romster@gmail.com> Date: Fri, 10 Jul 2020 22:54:29 +1000 Subject: [PATCH] cmocka: clean up build, use lib and not lib64 --- cmocka/.footprint | 20 ++++++++++---------- cmocka/.signature | 6 +++--- cmocka/Pkgfile | 9 ++++----- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/cmocka/.footprint b/cmocka/.footprint index e988de1f2..68979f651 100644 --- a/cmocka/.footprint +++ b/cmocka/.footprint @@ -2,13 +2,13 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/cmocka.h -rw-r--r-- root/root usr/include/cmocka_pbc.h -drwxr-xr-x root/root usr/lib64/ -drwxr-xr-x root/root usr/lib64/cmake/ -drwxr-xr-x root/root usr/lib64/cmake/cmocka/ --rw-r--r-- root/root usr/lib64/cmake/cmocka/cmocka-config-version.cmake --rw-r--r-- root/root usr/lib64/cmake/cmocka/cmocka-config.cmake -lrwxrwxrwx root/root usr/lib64/libcmocka.so -> libcmocka.so.0 -lrwxrwxrwx root/root usr/lib64/libcmocka.so.0 -> libcmocka.so.0.7.0 --rwxr-xr-x root/root usr/lib64/libcmocka.so.0.7.0 -drwxr-xr-x root/root usr/lib64/pkgconfig/ --rw-r--r-- root/root usr/lib64/pkgconfig/cmocka.pc +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/cmake/ +drwxr-xr-x root/root usr/lib/cmake/cmocka/ +-rw-r--r-- root/root usr/lib/cmake/cmocka/cmocka-config-version.cmake +-rw-r--r-- root/root usr/lib/cmake/cmocka/cmocka-config.cmake +lrwxrwxrwx root/root usr/lib/libcmocka.so -> libcmocka.so.0 +lrwxrwxrwx root/root usr/lib/libcmocka.so.0 -> libcmocka.so.0.7.0 +-rwxr-xr-x root/root usr/lib/libcmocka.so.0.7.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/cmocka.pc diff --git a/cmocka/.signature b/cmocka/.signature index 7871240db..6ffc50354 100644 --- a/cmocka/.signature +++ b/cmocka/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/esGRxS64JVP2a3/m31wIX5X5b/e70vE9xBRKHw7iyk44exKd9AFotd8BfSMZqlqfvr6AJr1a0Wmsm/fpPuPag0= -SHA256 (Pkgfile) = c42b04c3e6184e02e0bfa4c1b23e7dd7001f251101c5b4370c2d157a7e60f505 -SHA256 (.footprint) = 4d7defd1cbc548f0586f3d637f9f2fe74e35f976fc5431c19da456fb4e20b750 +RWSE3ohX2g5d/V/eTy5POEiK+X7dbe0ZyqqHJrW73t/iDR7+QTK5KJvrVxNS458S2jCb7+B9drk43o97iU/6PAXk59+R21Ky7Q0= +SHA256 (Pkgfile) = f99aa799398a8d9a6a207ef31e5aa1ce8a5f887ea48c292a710e3e11872b574d +SHA256 (.footprint) = 40e79c91bd69896f1a0a4fb6ebf786a57fc980df357af5f66c28947fb9bcab30 SHA256 (cmocka-1.1.5.tar.xz) = f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6 diff --git a/cmocka/Pkgfile b/cmocka/Pkgfile index d18089678..c15810cda 100644 --- a/cmocka/Pkgfile +++ b/cmocka/Pkgfile @@ -9,13 +9,12 @@ release=1 source=(https://cmocka.org/files/1.1/$name-$version.tar.xz) build() { - mkdir build; cd build - - cmake ../$name-$version \ + cmake -S$name-$version -Bbuild \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DUNIT_TESTING=On - make - make DESTDIR=$PKG install + cmake --build build + DESTDIR=$PKG cmake --install build }