Aurelien Larcher
2022-07-15 f9631e2252fd2c6954683ecb23f3156964e59188
libqb: fix build, drop 32-bit
4 files modified
72 ■■■■■ changed files
components/cluster/libqb/Makefile 41 ●●●● patch | view | raw | blame | history
components/cluster/libqb/libqb.p5m 21 ●●●●● patch | view | raw | blame | history
components/cluster/libqb/manifests/sample-manifest.p5m 9 ●●●● patch | view | raw | blame | history
components/cluster/libqb/pkg5 1 ●●●● patch | view | raw | blame | history
components/cluster/libqb/Makefile
@@ -13,29 +13,32 @@
# Copyright 2019 Andreas Grueninger, Grueninger GmbH, (grueni) 
#
BUILD_STYLE=configure
BUILD_BITS=64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=   libqb
COMPONENT_VERSION=  1.0.5
COMPONENT_FMRI= library/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION= Applications/System Utilities
COMPONENT_NAME=         libqb
COMPONENT_VERSION=      1.0.5
COMPONENT_REVISION=     1
COMPONENT_FMRI=         library/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION=Applications/System Utilities
COMPONENT_PROJECT_URL=  https://github.com/ClusterLabs/libqb
COMPONENT_SRC=    $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=  $(COMPONENT_SRC).tar.gz
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:89fe0c743e5be15f2fa25849f107df41cb144928259752d5c797c13644eba6b1
COMPONENT_ARCHIVE_URL=  \
  https://github.com/ClusterLabs/libqb/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
COMPONENT_LICENSE= LGPLv2
COMPONENT_SUMMARY= libqb is a library providing high performance logging, tracing, ipc, and poll.
    https://github.com/ClusterLabs/libqb/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
COMPONENT_LICENSE=      LGPLv2
COMPONENT_SUMMARY=      libqb is a library providing high performance logging, tracing, ipc, and poll.
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
include $(WS_MAKE_RULES)/common.mk
unexport SHELLOPTS
CFLAGS += -DNAME_MAX=255 -DHOST_NAME_MAX=255 -I/usr/include  -I/usr/include/heartbeat \
                     -lsocket -lnsl -ldladm -lssp_nonshared -lssp -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
CFLAGS += -DNAME_MAX=255 -DHOST_NAME_MAX=255 \
    -I/usr/include  -I/usr/include/heartbeat \
    -lsocket -lnsl -ldladm -lssp_nonshared -lssp \
    -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += --localstatedir=/var
@@ -56,11 +59,7 @@
#    /var/run/hacluster must exist and must be writable for the build user
#
build:          $(BUILD_32_and_64)
install:        $(INSTALL_32_and_64)
test:           $(TEST_32_and_64)
REQUIRED_PACKAGES += system/library
# Build dependencies
REQUIRED_PACKAGES += developer/documentation-tool/doxygen
# Auto-generated dependencies
REQUIRED_PACKAGES += system/library
components/cluster/libqb/libqb.p5m
@@ -1,10 +1,11 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL)". You may
# only use this file in accordance with the terms of the CDDL.
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# source.  A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
@@ -13,13 +14,12 @@
# Copyright 2019 Andreas Grueninger, Grueninger GmbH, (grueni)
#
<transform file path=usr/share/man/man1m/(.+).1m$ -> set action.hash usr/share/man/man8/%<1>.8 >
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.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
@@ -39,16 +39,10 @@
file path=usr/include/qb/qbrb.h
file path=usr/include/qb/qbutil.h
link path=usr/lib/libqb.so target=libqb.so.0.19.2
link path=usr/lib/libqb.so.0 target=libqb.so.0.19.2
file path=usr/lib/libqb.so.0.19.2
file path=usr/lib/pkgconfig/libqb.pc
link path=usr/lib/$(MACH64)/libqb.so target=libqb.so.0.19.2
link path=usr/lib/$(MACH64)/libqb.so.0 target=libqb.so.0.19.2
file path=usr/lib/$(MACH64)/libqb.so.0.19.2
file path=usr/lib/$(MACH64)/pkgconfig/libqb.pc
file usr/sbin/$(MACH64)/qb-blackbox path=usr/sbin/qb-blackbox
file path=usr/share/doc/libqb/COPYING
file path=usr/share/doc/libqb/INSTALL
@@ -66,5 +60,4 @@
file path=usr/share/man/man3/qbmap.h.3
file path=usr/share/man/man3/qbrb.h.3
file path=usr/share/man/man3/qbutil.h.3
file path=usr/share/man/man1m/qb-blackbox.1m
file path=usr/share/man/man8/qb-blackbox.8
components/cluster/libqb/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2018 <contributor>
# Copyright 2022 <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)
@@ -41,12 +42,6 @@
link path=usr/lib/$(MACH64)/libqb.so.0 target=libqb.so.0.19.2
file path=usr/lib/$(MACH64)/libqb.so.0.19.2
file path=usr/lib/$(MACH64)/pkgconfig/libqb.pc
file path=usr/lib/libqb.a
link path=usr/lib/libqb.so target=libqb.so.0.19.2
link path=usr/lib/libqb.so.0 target=libqb.so.0.19.2
file path=usr/lib/libqb.so.0.19.2
file path=usr/lib/pkgconfig/libqb.pc
file path=usr/sbin/$(MACH64)/qb-blackbox
file path=usr/sbin/qb-blackbox
file path=usr/share/doc/libqb/COPYING
file path=usr/share/doc/libqb/INSTALL
components/cluster/libqb/pkg5
@@ -2,6 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "developer/documentation-tool/doxygen",
        "shell/ksh93",
        "system/library"
    ],
    "fmris": [