head	1.2;
access;
symbols
	pkgsrc-2023Q1:1.1.0.8
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.6
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.4
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.2
	pkgsrc-2022Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2023.04.19.13.12.36;	author sjmulder;	state dead;
branches;
next	1.1;
commitid	ELCtzIBKLUu7GIlE;

1.1
date	2022.04.17.20.00.34;	author sjmulder;	state Exp;
branches;
next	;
commitid	hzUrxBzbc8MtJAAD;


desc
@@


1.2
log
@devel/mustach: Delete old patch file
@
text
@$NetBSD: patch-Makefile,v 1.1 2022/04/17 20:00:34 sjmulder Exp $

Don't use -soname on macOS.
https://gitlab.com/jobol/mustach/-/merge_requests/26

--- Makefile.orig	2022-04-17 19:51:45.000000000 +0000
+++ Makefile
@@@@ -148,11 +148,17 @@@@ $(info cjson   = ${cjson})
 override CFLAGS += -fPIC -Wall -Wextra -DVERSION=${VERSION}
 
 ifeq ($(shell uname),Darwin)
- darwin_single = -install_name $(LIBDIR)/libmustach.so$(SOVEREV)
- darwin_core = -install_name $(LIBDIR)/libmustach-core.so$(SOVEREV)
- darwin_cjson = -install_name $(LIBDIR)/libmustach-cjson.so$(SOVEREV)
- darwin_jsonc = -install_name $(LIBDIR)/libmustach-json-c.so$(SOVEREV)
- darwin_jansson = -install_name $(LIBDIR)/libmustach-jansson.so$(SOVEREV)
+ LDFLAGS_single  += -install_name $(LIBDIR)/libmustach.so$(SOVEREV)
+ LDFLAGS_core    += -install_name $(LIBDIR)/libmustach-core.so$(SOVEREV)
+ LDFLAGS_cjson   += -install_name $(LIBDIR)/libmustach-cjson.so$(SOVEREV)
+ LDFLAGS_jsonc   += -install_name $(LIBDIR)/libmustach-json-c.so$(SOVEREV)
+ LDFLAGS_jansson += -install_name $(LIBDIR)/libmustach-jansson.so$(SOVEREV)
+else
+ LDFLAGS_single  += -Wl,-soname,libmustach.so$(SOVER)
+ LDFLAGS_core    += -Wl,-soname,libmustach-core.so$(SOVER)
+ LDFLAGS_cjson   += -Wl,-soname,libmustach-cjson.so$(SOVER)
+ LDFLAGS_jsonc   += -Wl,-soname,libmustach-json-c.so$(SOVER)
+ LDFLAGS_jansson += -Wl,-soname,libmustach-jansson.so$(SOVER)
 endif
 
 # targets
@@@@ -164,19 +170,19 @@@@ mustach: $(TOOLOBJS)
 	$(CC) $(LDFLAGS) $(TOOLFLAGS) -o mustach $(TOOLOBJS) $(TOOLLIBS)
 
 libmustach.so$(SOVEREV): $(SINGLEOBJS)
-	$(CC) -shared -Wl,-soname,libmustach.so$(SOVER) $(LDFLAGS) $(darwin_single) -o $@@ $^ $(SINGLELIBS)
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_single) -o $@@ $^ $(SINGLELIBS)
 
 libmustach-core.so$(SOVEREV): $(COREOBJS)
-	$(CC) -shared -Wl,-soname,libmustach-core.so$(SOVER) $(LDFLAGS) $(darwin_core) -o $@@ $(COREOBJS) $(lib_OBJ)
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_core) -o $@@ $(COREOBJS) $(lib_OBJ)
 
 libmustach-cjson.so$(SOVEREV): $(COREOBJS) mustach-cjson.o
-	$(CC) -shared -Wl,-soname,libmustach-cjson.so$(SOVER) $(LDFLAGS) $(darwin_cjson) -o $@@ $^ $(cjson_libs)
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_cjson) -o $@@ $^ $(cjson_libs)
 
 libmustach-json-c.so$(SOVEREV): $(COREOBJS) mustach-json-c.o
-	$(CC) -shared -Wl,-soname,libmustach-json-c.so$(SOVER) $(LDFLAGS) $(darwin_jsonc) -o $@@ $^ $(jsonc_libs)
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_jsonc) -o $@@ $^ $(jsonc_libs)
 
 libmustach-jansson.so$(SOVEREV): $(COREOBJS) mustach-jansson.o
-	$(CC) -shared -Wl,-soname,libmustach-jansson.so$(SOVER) $(LDFLAGS) $(darwin_jansson) -o $@@ $^ $(jansson_libs)
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_jansson) -o $@@ $^ $(jansson_libs)
 
 # pkgconfigs
 
@


1.1
log
@devel/mustach: Remove old patch, fix macOS build

 - test6/Makefile patch is merged upstream
 - Fix macOS breakage caused by -soname use
@
text
@d1 1
a1 1
$NetBSD$
@