pkg-config: drop dependency on developer/gnome/gettext

Marcel Telka

2024-01-16 8e184af29bdf9838956194c9216de9eadd1909fa

pkg-config: drop dependency on developer/gnome/gettext

 components/developer/pkg-config/Makefile

@@ -24,13 +24,11 @@
# Copyright (c) 2017, Aurelien Larcher
#

BUILD_STYLE=configure
BUILD_BITS=64
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=         pkg-config
COMPONENT_VERSION=      0.29.2
COMPONENT_REVISION=     4
COMPONENT_REVISION=     5
COMPONENT_FMRI=         developer/build/pkg-config
COMPONENT_SUMMARY=      A tool to query library build-time information
COMPONENT_CLASSIFICATION=Development/System
@@ -42,7 +40,10 @@
    sha256:6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591
COMPONENT_ARCHIVE_URL=  \
    https://pkgconfig.freedesktop.org/releases/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=      GPLv2
COMPONENT_LICENSE=      GPL-2.0-only
COMPONENT_LICENSE_FILE=    COPYING

USE_DEFAULT_TEST_TRANSFORMS = yes

include $(WS_MAKE_RULES)/common.mk

@@ -52,15 +53,9 @@

# have pkg-config strip any of the default linker search directories
CONFIGURE_OPTIONS += --with-system-library-path='/lib:/usr/lib:/lib/${MACH64}:/usr/lib/${MACH64}:/lib/64:/usr/lib/64'

COMPONENT_TEST_MASTER =    $(COMPONENT_TEST_RESULTS_DIR)/results-all.master

# Strip make lines from test output
COMPONENT_TEST_TRANSFORMS += \
    '-e "/^Making/d" ' \
    '-e "/^make/d" '
# We do not want usr/bin/$(GCC_GNU_TRIPLET)-pkg-config link
CONFIGURE_OPTIONS += --disable-host-tool

# Auto-generated dependencies
REQUIRED_PACKAGES += developer/gnome/gettext
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += system/library

 components/developer/pkg-config/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2022 <contributor>
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -24,7 +24,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/pkg-config
hardlink path=usr/bin/$(GCC_GNU_TRIPLET)-pkg-config target=pkg-config
file path=usr/share/aclocal/pkg.m4
file path=usr/share/doc/pkg-config/pkg-config-guide.html
file path=usr/share/man/man1/pkg-config.1

 components/developer/pkg-config/patches/001-rpath.patch

@@ -4,8 +4,8 @@
# a system libpath, not just -Lpath.
#

--- pkg-config-0.29.2/pkg.c.orig    Mon Mar 20 11:34:23 2017
+++ pkg-config-0.29.2/pkg.c    Mon Jan 29 21:21:41 2018
--- pkg-config-0.29.2/pkg.c.orig
+++ pkg-config-0.29.2/pkg.c
@@ -863,32 +863,54 @@
       GList *system_dir_iter = system_directories;
       Flag *flag = iter->data;

 components/developer/pkg-config/patches/002-enforce-sorted-list-all.patch

@@ -1,7 +1,7 @@
pkg-config --list-all output relies on the order enforced by hash_table implementation 

--- pkg-config-0.29.2/pkg.c.orig    2022-07-15 16:17:45.331952900 +0000
+++ pkg-config-0.29.2/pkg.c    2022-07-15 16:28:10.037642738 +0000
--- pkg-config-0.29.2/pkg.c.orig
+++ pkg-config-0.29.2/pkg.c
@@ -1191,9 +1191,9 @@
 }
 
@@ -27,8 +27,8 @@
 }
 
 void
--- pkg-config-0.29.2/check/check-print-options.orig    2022-07-15 16:33:01.504509089 +0000
+++ pkg-config-0.29.2/check/check-print-options    2022-07-15 16:33:36.819642587 +0000
--- pkg-config-0.29.2/check/check-print-options.orig
+++ pkg-config-0.29.2/check/check-print-options
@@ -35,9 +35,9 @@
 run_test --print-requires-private requires-test
 

 components/developer/pkg-config/pkg-config.license

File was deleted

 components/developer/pkg-config/pkg-config.p5m

@@ -32,9 +32,3 @@
file path=usr/share/aclocal/pkg.m4
file path=usr/share/doc/pkg-config/pkg-config-guide.html
file path=usr/share/man/man1/pkg-config.1

# pkg-config was previously delivered in developer/gnome/text.
# This optional dependency is here to facilitate the safe
# transfer of the package to the 'userland' consolidation.

depend type=optional fmri=pkg:/developer/gnome/gettext@2.30.0,5.11-0.151.1.8.1

 components/developer/pkg-config/pkg5

@@ -1,13 +1,10 @@
{
    "dependencies": [
        "SUNWcs",
        "developer/gnome/gettext",
        "library/glib2",
        "shell/ksh93",
        "system/library"
    ],
    "fmris": [
        "developer/build/pkg-config"
    ],
    "name": "pkg-config"
}
}

 components/developer/pkg-config/test/results-all.master

@@ -1,4 +1,3 @@
/usr/gnu/bin/make  check-TESTS
PASS: check-cflags
PASS: check-libs
PASS: check-mixed-flags
@@ -29,6 +28,3 @@
PASS: check-variables
PASS: check-dependencies
PASS: check-system-flags
===================
All 30 tests passed
===================