pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/56226: lz4 build issues on Solaris 10



>Number:         56226
>Category:       pkg
>Synopsis:       lz4 build issues on Solaris 10
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jun 01 08:55:00 +0000 2021
>Originator:     Claes Nästén
>Release:        trunk 2021-06-01
>Organization:
>Environment:
SunOS u40 5.10 Generic_147148-26 i86pc i386 i86pc

>Description:
lz4 fails to build on Solaris 10 due to missing -lrt as nanosleep is used.
>How-To-Repeat:
Build archivers/lz4 on Solaris 10
>Fix:
diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo
index fe92331e66a..8193b280cf7 100644
--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -6,4 +6,4 @@ SHA512 (lz4-1.9.3.tar.gz) = c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a8
 Size (lz4-1.9.3.tar.gz) = 320958 bytes
 SHA1 (patch-Makefile.inc) = 55d576430ed1a160709a56e104edc14cad88e5a9
 SHA1 (patch-lib_Makefile) = 8eda2146522bd2d5e418916fd99fb201810cb36d
-SHA1 (patch-programs_Makefile) = 671728182325f03164eb898d9d846fd2aa4353f7
+SHA1 (patch-programs_Makefile) = 5caf93bd0235fbcc5a996ec33873e6dd4e2e59a2
diff --git a/archivers/lz4/patches/patch-programs_Makefile b/archivers/lz4/patches/patch-programs_Makefile
index ced37e86bb9..9c896487ff5 100644
--- a/archivers/lz4/patches/patch-programs_Makefile
+++ b/archivers/lz4/patches/patch-programs_Makefile
@@ -2,9 +2,34 @@ $NetBSD: patch-programs_Makefile,v 1.12 2019/04/30 09:17:39 adam Exp $
 
 Unlock install target. Use pkgsrc install scripts.
 
---- programs/Makefile.orig     2019-04-23 17:18:40.000000000 +0000
+--- programs/Makefile.orig     2020-11-16 04:59:35.000000000 +0000
 +++ programs/Makefile
-@@ -140,20 +140,20 @@ BINDIR      ?= $(exec_prefix)/bin
+@@ -53,6 +53,15 @@ DEBUGFLAGS= -Wall -Wextra -Wundef -Wcast
+ CFLAGS   += $(DEBUGFLAGS) $(MOREFLAGS)
+ FLAGS     = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
++UNAME := $(shell uname)
++UNAME_R := $(shell uname -r)
++
++ifneq (,$(filter $(UNAME),SunOS))
++ifeq (5.10,$(UNAME_R))
++NANOSLEEP_LD = -lrt
++endif
++endif
++
+ LZ4_VERSION=$(LIBVER)
+ MD2ROFF   = ronn
+ MD2ROFF_FLAGS = --roff --warnings --manual="User Commands" --organization="lz4 $(LZ4_VERSION)"
+@@ -83,7 +92,7 @@ lz4: $(OBJFILES) lz4-exe.o
+       $(CC) $(FLAGS) $^ -o $@$(EXT)
+ else
+ lz4: $(OBJFILES)
+-      $(CC) $(FLAGS) $(OBJFILES) -o $@$(EXT) $(LDLIBS)
++      $(CC) $(FLAGS) $(NANOSLEEP_LD) $(OBJFILES) -o $@$(EXT) $(LDLIBS)
+ endif
+ 
+ .PHONY: lz4-release
+@@ -154,20 +163,20 @@ BINDIR      ?= $(exec_prefix)/bin
  bindir      ?= $(BINDIR)
  DATAROOTDIR ?= $(prefix)/share
  datarootdir ?= $(DATAROOTDIR)


Home | Main Index | Thread Index | Old Index