Pacemaker: drop special GNU TLS 3 handling

Michal Nowak

2020-01-03 4a38c4130d539184633a1cff0edf11c5050375b5

Pacemaker: drop special GNU TLS 3 handling

 components/cluster/pacemaker/Makefile

@@ -10,28 +10,29 @@

#
# Copyright 2019 Andreas Grueninger, Grueninger GmbH, (grueni). All rights reserved.
# Copyright 2020 Michal Nowak
#

BUILD_BITS=        64

include ../../../make-rules/shared-macros.mk

PATH= $(USRBINDIR64):$(PATH.gnu)

COMPONENT_NAME= pacemaker
COMPONENT_VERSION= 1.1.21
COMPONENT_REVISION= 1
COMPONENT_FMRI= application/cluster/$(COMPONENT_NAME)
COMPONENT_NAME=        pacemaker
COMPONENT_VERSION=    1.1.21
COMPONENT_REVISION=    2
COMPONENT_FMRI=        application/cluster/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION= System/Services
COMPONENT_SRC= $(COMPONENT_NAME)-Pacemaker-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:4914f2caf5676ecf54b2fd19c59b40268a54b04703b56cf840cb63fbdbbb7d06
COMPONENT_PROJECT_URL= https://www.clusterlab.org
COMPONENT_ARCHIVE_URL= https://github.com/Clusterlabs/$(COMPONENT_NAME)/archive/Pacemaker-$(COMPONENT_VERSION).tar.gz
COMPONENT_LICENSE= GPLv2,LGPLv2,BSD
COMPONENT_SUMMARY= Pacemaker is an advanced, scalable high-availability cluster resource manager.
COMPONENT_SRC=        $(COMPONENT_NAME)-Pacemaker-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH=    sha256:4914f2caf5676ecf54b2fd19c59b40268a54b04703b56cf840cb63fbdbbb7d06
COMPONENT_PROJECT_URL=    https://www.clusterlab.org
COMPONENT_ARCHIVE_URL=    https://github.com/Clusterlabs/$(COMPONENT_NAME)/archive/Pacemaker-$(COMPONENT_VERSION).tar.gz
COMPONENT_LICENSE=    GPLv2,LGPLv2,BSD
COMPONENT_SUMMARY=    Pacemaker is an advanced, scalable high-availability cluster resource manager.

include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
include $(WS_MAKE_RULES)/common.mk

COMPONENT_PREP_ACTION=(cd $(SOURCE_DIR); $(CONFIG_SHELL) autogen.sh )

@@ -40,13 +41,6 @@
CONFIGURE_SCRIPT= $(@D)/configure

CFLAGS += -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS -lssp_nonshared -lssp -lnsl

# Force use of gnutls-3 pkgconfig during 2.x->3.x transition
GNUTLS_PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig/gnutls-3
PKG_CONFIG_PATH = $(GNUTLS_PKG_CONFIG_PATH_$(BITS)):$(PKG_CONFIG_PATH.$(BITS))

LD_OPTIONS.64 += -L/usr/lib/$(MACH64)/gnutls-3 -R/usr/lib/$(MACH64)/gnutls-3
LD_OPTIONS += $(LD_OPTIONS.$(BITS))

CONFIGURE_OPTIONS.64 += --libexecdir=$(CONFIGURE_PREFIX)/lib
CONFIGURE_OPTIONS += --sysconfdir=/etc
@@ -67,17 +61,9 @@
CONFIGURE_ENV.64 += LT_SYS_LIBRARY_PATH="/lib/$(MACH64):/usr/lib/$(MACH64)"

COMPONENT_POST_INSTALL_ACTION=( \
    $(RM) -r $(PROTO_DIR)$(USRSHAREDIR)/$(COMPONENT_NAME)/examples; \
    $(MKDIR) $(PROTO_DIR)$(USRSHAREDIR)/$(COMPONENT_NAME)/examples; \
    $(MV)    $(PROTO_DIR)/etc/logrotate.d  $(PROTO_DIR)$(USRSHAREDIR)/$(COMPONENT_NAME)/examples;)

CONFIGURE_SBINDIR.64= $(CONFIGURE_SBINDIR.32)

build:          $(BUILD_64)

install:        $(INSTALL_64)

test:           $(TESTS_64)
    $(RM) -r $(PROTO_DIR)$(USRSHAREDIR)/$(COMPONENT_NAME)/examples; \
    $(MKDIR) $(PROTO_DIR)$(USRSHAREDIR)/$(COMPONENT_NAME)/examples; \
    $(MV)    $(PROTO_DIR)/etc/logrotate.d  $(PROTO_DIR)$(USRSHAREDIR)/$(COMPONENT_NAME)/examples;)

REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += utility/arpsend