git: 7c02cf0f311c - main - devel/libcds: Move files from lib64 to lib

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Fri, 30 Sep 2022 06:19:15 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7c02cf0f311c4df8dcf9b3630937801be31e598e

commit 7c02cf0f311c4df8dcf9b3630937801be31e598e
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-09-30 06:12:16 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-09-30 06:19:07 +0000

    devel/libcds: Move files from lib64 to lib
    
    Reported by:    fallout
---
 devel/libcds/Makefile                   |  1 +
 devel/libcds/files/patch-CMakeLists.txt | 11 +++++++++++
 devel/libcds/pkg-plist                  |  6 +++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/devel/libcds/Makefile b/devel/libcds/Makefile
index 878b10c12594..25ebd6921523 100644
--- a/devel/libcds/Makefile
+++ b/devel/libcds/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	libcds
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.3-102
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g9985d2a8
 CATEGORIES=	devel
 
diff --git a/devel/libcds/files/patch-CMakeLists.txt b/devel/libcds/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..2b8d594e95fa
--- /dev/null
+++ b/devel/libcds/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2022-09-30 05:19:34 UTC
++++ CMakeLists.txt
+@@ -118,7 +118,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID S
+ 
+     if(CMAKE_TARGET_ARCHITECTURE STREQUAL "x86_64")
+         list(APPEND LIBCDS_PUBLIC_CXX_FLAGS "-mcx16")
+-        set(LIB_SUFFIX "64")
++        set(LIB_SUFFIX "")
+ 
+         # GCC-7: 128-bit atomics support is implemented via libatomic on amd64
+         #        see https://gcc.gnu.org/ml/gcc/2017-01/msg00167.html
diff --git a/devel/libcds/pkg-plist b/devel/libcds/pkg-plist
index bf6a08210aa4..349cd4fe7ff9 100644
--- a/devel/libcds/pkg-plist
+++ b/devel/libcds/pkg-plist
@@ -355,6 +355,6 @@ include/cds/user_setup/threading.h
 include/cds/version.h
 lib/cmake/LibCDS/LibCDSConfig-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/LibCDS/LibCDSConfig.cmake
-lib64/libcds-s.a
-lib64/libcds.so
-lib64/libcds.so.2.3.3
+lib/libcds-s.a
+lib/libcds.so
+lib/libcds.so.2.3.3