From d354933f2edaa2b56cfd2b2c23117b452e59a07b Mon Sep 17 00:00:00 2001
From: klausz65 <61782506+klausz65@users.noreply.github.com>
Date: Thu, 21 Nov 2024 20:41:35 +0100
Subject: [PATCH] czmq: only build 64bit, dependencies like curl are allready
 at 64bit

---
 components/library/czmq/Makefile                      | 10 ++--------
 components/library/czmq/czmq.p5m                      | 12 ++++--------
 components/library/czmq/manifests/sample-manifest.p5m | 14 +++++---------
 components/library/czmq/pkg5                          |  3 +--
 4 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/components/library/czmq/Makefile b/components/library/czmq/Makefile
index cf7cfe6207..490ae1f3eb 100644
--- a/components/library/czmq/Makefile
+++ b/components/library/czmq/Makefile
@@ -12,14 +12,14 @@
 #
 # Copyright 2016 Jim Klimov
 # Copyright 2020 Alexander Pyhalov
+# Copyright 2024 Klaus Ziegler
 #
 
-BUILD_BITS=64_and_32
-
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME= czmq
 COMPONENT_VERSION= 4.2.1
+COMPONENT_REVISION= 1
 COMPONENT_SUMMARY= C bindings for 0MQ
 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
@@ -44,12 +44,6 @@ COMPONENT_PREP_ACTION =	\
 
 COMPONENT_PRE_CONFIGURE_ACTION =	($(CLONEY) $(SOURCE_DIR) $(@D))
 
-CXXFLAGS.32=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CFLAGS.32=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-CXXFLAGS+=$(CXXFLAGS.$(BITS))
-CFLAGS += $(CFLAGS.$(BITS))
-
 CXXFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 
diff --git a/components/library/czmq/czmq.p5m b/components/library/czmq/czmq.p5m
index 4ae3222afe..d387c0fbf6 100644
--- a/components/library/czmq/czmq.p5m
+++ b/components/library/czmq/czmq.p5m
@@ -12,6 +12,7 @@
 #
 # Copyright 2016 Jim Klimov
 # Copyright 2020 Alexander Pyhalov
+# Copyright 2024 Klaus Ziegler
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -23,7 +24,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
-#file path=usr/bin/$(MACH32)/zmakecert
 file path=usr/bin/zmakecert
 file path=usr/include/czmq.h
 file path=usr/include/czmq_library.h
@@ -68,14 +68,10 @@ file path=usr/include/zsys.h
 file path=usr/include/ztimerset.h
 file path=usr/include/ztrie.h
 file path=usr/include/zuuid.h
-link path=usr/lib/$(MACH64)/libczmq.so target=libczmq.so.$(COMPONENT_VERSION)
-file path=usr/lib/$(MACH64)/libczmq.so.$(COMPONENT_VERSION)
-link path=usr/lib/$(MACH64)/libczmq.so.4 target=libczmq.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/libczmq.so target=libczmq.so.$(HUMAN_VERSION)
+file path=usr/lib/$(MACH64)/libczmq.so.$(HUMAN_VERSION)
+link path=usr/lib/$(MACH64)/libczmq.so.4 target=libczmq.so.$(HUMAN_VERSION)
 file path=usr/lib/$(MACH64)/pkgconfig/libczmq.pc
-link path=usr/lib/libczmq.so target=libczmq.so.$(COMPONENT_VERSION)
-file path=usr/lib/libczmq.so.$(COMPONENT_VERSION)
-link path=usr/lib/libczmq.so.4 target=libczmq.so.$(COMPONENT_VERSION)
-file path=usr/lib/pkgconfig/libczmq.pc
 file path=usr/share/man/man1/zmakecert.1
 file path=usr/share/man/man3/zactor.3
 file path=usr/share/man/man3/zargs.3
diff --git a/components/library/czmq/manifests/sample-manifest.p5m b/components/library/czmq/manifests/sample-manifest.p5m
index 883bad2ad4..7addc5ae1e 100644
--- a/components/library/czmq/manifests/sample-manifest.p5m
+++ b/components/library/czmq/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
 #
 
 #
-# Copyright 2020 <contributor>
+# Copyright 2024 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="$(COMPONENT_SUMMARY)"
 set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,7 +23,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
-file path=usr/bin/$(MACH32)/zmakecert
 file path=usr/bin/zmakecert
 file path=usr/include/czmq.h
 file path=usr/include/czmq_library.h
@@ -67,14 +67,10 @@ file path=usr/include/zsys.h
 file path=usr/include/ztimerset.h
 file path=usr/include/ztrie.h
 file path=usr/include/zuuid.h
-link path=usr/lib/$(MACH64)/libczmq.so target=libczmq.so.$(COMPONENT_VERSION)
-file path=usr/lib/$(MACH64)/libczmq.so.$(COMPONENT_VERSION)
-link path=usr/lib/$(MACH64)/libczmq.so.4 target=libczmq.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/libczmq.so target=libczmq.so.$(HUMAN_VERSION)
+file path=usr/lib/$(MACH64)/libczmq.so.$(HUMAN_VERSION)
+link path=usr/lib/$(MACH64)/libczmq.so.4 target=libczmq.so.$(HUMAN_VERSION)
 file path=usr/lib/$(MACH64)/pkgconfig/libczmq.pc
-link path=usr/lib/libczmq.so target=libczmq.so.$(COMPONENT_VERSION)
-file path=usr/lib/libczmq.so.$(COMPONENT_VERSION)
-link path=usr/lib/libczmq.so.4 target=libczmq.so.$(COMPONENT_VERSION)
-file path=usr/lib/pkgconfig/libczmq.pc
 file path=usr/share/man/man1/zmakecert.1
 file path=usr/share/man/man3/zactor.3
 file path=usr/share/man/man3/zargs.3
diff --git a/components/library/czmq/pkg5 b/components/library/czmq/pkg5
index 3c6e8cf342..5a654f8516 100644
--- a/components/library/czmq/pkg5
+++ b/components/library/czmq/pkg5
@@ -1,6 +1,5 @@
 {
     "dependencies": [
-        "SUNWcs",
         "library/c++/zeromq",
         "library/libmicrohttpd",
         "library/lz4",
@@ -11,4 +10,4 @@
         "library/c++/czmq"
     ],
     "name": "czmq"
-}
\ No newline at end of file
+}
-- 
2.11.4.GIT