diff options
| -rw-r--r-- | system/corectrl/corectrl.SlackBuild | 20 | ||||
| -rw-r--r-- | system/corectrl/corectrl.info | 6 | ||||
| -rw-r--r-- | system/corectrl/install_libs_in_lib64_directory.patch | 12 |
3 files changed, 10 insertions, 28 deletions
diff --git a/system/corectrl/corectrl.SlackBuild b/system/corectrl/corectrl.SlackBuild index 802cbcf3fb0a5..198120e66e2df 100644 --- a/system/corectrl/corectrl.SlackBuild +++ b/system/corectrl/corectrl.SlackBuild @@ -24,10 +24,10 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=corectrl -VERSION=${VERSION:-v1.3.0} +PRGNAM=corectrl +VERSION=${VERSION:-v1.3.2} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then @@ -38,17 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -64,7 +61,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -83,9 +80,6 @@ find -L . \ # one category, e.g. System: patch -p1 < $CWD/corectrl.patch -# Patch src/CMakefiles.txt such that libraries are placed in /usr/lib64: -patch -p1 < $CWD/install_libs_in_lib64_directory.patch - mkdir -p build cd build cmake \ @@ -95,7 +89,7 @@ cd build -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=OFF .. - make + make make install/strip DESTDIR=$PKG cd .. diff --git a/system/corectrl/corectrl.info b/system/corectrl/corectrl.info index 6ebcf115bfbe1..681b3e7e29437 100644 --- a/system/corectrl/corectrl.info +++ b/system/corectrl/corectrl.info @@ -1,8 +1,8 @@ PRGNAM="corectrl" -VERSION="v1.3.0" +VERSION="v1.3.2" HOMEPAGE="https://gitlab.com/corectrl/corectrl/" -DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.3.0/corectrl-v1.3.0.tar.gz" -MD5SUM="e18c43e86d304682b031b8489d2221ca" +DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.3.2/corectrl-v1.3.2.tar.gz" +MD5SUM="656d7d307c7f0185794d08239bf00d58" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="Botan" diff --git a/system/corectrl/install_libs_in_lib64_directory.patch b/system/corectrl/install_libs_in_lib64_directory.patch deleted file mode 100644 index 22b15b8a8b848..0000000000000 --- a/system/corectrl/install_libs_in_lib64_directory.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- corectrl-v1.3.0/src/CMakeLists.txt 2022-09-18 12:56:52.000000000 -0500 -+++ corectrl-v1.3.0/src/CMakeLists.txt.new 2022-10-05 11:51:27.147208476 -0500 -@@ -417,7 +417,7 @@ - ) - - install(TARGETS corectrl corectrl_lib -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) - - add_subdirectory(helper) |