pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gkrellm: Fix linkage on SunOS
Module Name: pkgsrc-wip
Committed By: PHO <pho%cielonegro.org@localhost>
Pushed By: pho
Date: Thu Aug 28 09:33:36 2025 +0900
Changeset: 04b4ebea70101ecf5ac4227198eb8e42e668e9a9
Modified Files:
gkrellm/distinfo
gkrellm/patches/patch-src_Makefile
Log Message:
gkrellm: Fix linkage on SunOS
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=04b4ebea70101ecf5ac4227198eb8e42e668e9a9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gkrellm/distinfo | 2 +-
gkrellm/patches/patch-src_Makefile | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diffs:
diff --git a/gkrellm/distinfo b/gkrellm/distinfo
index fcc31b8220..b0d7a8db22 100644
--- a/gkrellm/distinfo
+++ b/gkrellm/distinfo
@@ -5,4 +5,4 @@ SHA512 (gkrellm-2.4.0.tar.bz2) = 770acfe5ee23b74ffe5becc89d3735e9e8688ac338b052e
Size (gkrellm-2.4.0.tar.bz2) = 790070 bytes
SHA1 (patch-gkrellmd.1) = 579f6eac994ec5321645a21a117e621260be8a6c
SHA1 (patch-server_Makefile) = a8194ddd9dc9f58cbacd0615914b53cc2af8a9b0
-SHA1 (patch-src_Makefile) = f9c9ebe1f25aa6560fe5034e8df705d0c90374eb
+SHA1 (patch-src_Makefile) = 6bfbcd0d33975671cbd1d60473a00b55a27eba2a
diff --git a/gkrellm/patches/patch-src_Makefile b/gkrellm/patches/patch-src_Makefile
index e5b3521584..a132eb7a75 100644
--- a/gkrellm/patches/patch-src_Makefile
+++ b/gkrellm/patches/patch-src_Makefile
@@ -4,10 +4,10 @@ Hunk #1:
Support building on DragonFly.
Hunk #0, #2:
- Add an explicit -lm for Solaris. Not sure why it's needed but we've been
- doing this.
+ Add an explicit -lm for Solaris. Also avoid passing -Wl,-E to the Solaris
+ linker because it doesn't support the flag.
---- src/Makefile.orig 2025-08-25 12:22:48.901061537 +0000
+--- src/Makefile.orig 2025-01-19 16:02:37.000000000 +0000
+++ src/Makefile
@@ -82,6 +82,7 @@ ifneq ($(PACKAGE),gkrellm)
FLAGS += -DPACKAGE=\"$(PACKAGE)\"
@@ -27,18 +27,19 @@ Hunk #0, #2:
freebsd2:
ifeq ($(HAVE_SSL),1)
$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
-@@ -161,8 +165,13 @@ openbsd:
+@@ -161,8 +165,15 @@ openbsd:
$(MAKE) GTOP_LIBS= SYS_LIBS="-lkvm -pthread" gkrellm
solaris:
-- $(MAKE) CFLAGS="-Wno-implicit-int" \
-- SYS_LIBS="-lkstat -lkvm -ldevinfo" gkrellm
+ifeq ($(OS_RELEASE),5.8)
+ $(MAKE) CFLAGS="-Wno-implicit-int -DSOLARIS_8" \
-+ SYS_LIBS="-lm -lkstat -lkvm -ldevinfo -lsocket -lnsl -lintl -lresolv" gkrellm
++ SYS_LIBS="-lm -lkstat -lkvm -ldevinfo -lsocket -lnsl -lintl -lresolv" \
++ LINK_FLAGS="" gkrellm
+else
-+ $(MAKE) CFLAGS="-Wno-implicit-int -DSOLARIS_8" \
-+ SYS_LIBS="-lm -lkstat -lkvm -ldevinfo -lsocket -lnsl -lresolv" gkrellm
+ $(MAKE) CFLAGS="-Wno-implicit-int" \
+- SYS_LIBS="-lkstat -lkvm -ldevinfo" gkrellm
++ SYS_LIBS="-lm -lkstat -lkvm -ldevinfo -lsocket -lnsl -lresolv" \
++ LINK_FLAGS="" gkrellm
+endif
windows: libgkrellm.a
Home |
Main Index |
Thread Index |
Old Index