pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc/lowdown
Module Name: pkgsrc
Committed By: gutteridge
Date: Wed Nov 19 15:54:26 UTC 2025
Modified Files:
pkgsrc/textproc/lowdown: Makefile distinfo
pkgsrc/textproc/lowdown/patches: patch-Makefile
Log Message:
lowdown: fix compat function linking differently
As of 2.0.4, upstream actually added context to handle this linking
while keeping other symbol visibility hidden as they want. However, it
wasn't factored in to the "libtoolization" changes that were made for
pkgsrc purposes. (PR pkg/59614, PR pkg/59619.)
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/textproc/lowdown/Makefile \
pkgsrc/textproc/lowdown/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/lowdown/patches/patch-Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/textproc/lowdown/Makefile
diff -u pkgsrc/textproc/lowdown/Makefile:1.37 pkgsrc/textproc/lowdown/Makefile:1.38
--- pkgsrc/textproc/lowdown/Makefile:1.37 Wed Nov 19 14:36:03 2025
+++ pkgsrc/textproc/lowdown/Makefile Wed Nov 19 15:54:26 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2025/11/19 14:36:03 gutteridge Exp $
+# $NetBSD: Makefile,v 1.38 2025/11/19 15:54:26 gutteridge Exp $
DISTNAME= lowdown-2.0.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=kristapsdz/}
GITHUB_TAG= refs/tags/VERSION_${PKGVERSION_NOREV:S/./_/g}
Index: pkgsrc/textproc/lowdown/distinfo
diff -u pkgsrc/textproc/lowdown/distinfo:1.37 pkgsrc/textproc/lowdown/distinfo:1.38
--- pkgsrc/textproc/lowdown/distinfo:1.37 Wed Nov 19 14:37:04 2025
+++ pkgsrc/textproc/lowdown/distinfo Wed Nov 19 15:54:26 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.37 2025/11/19 14:37:04 gutteridge Exp $
+$NetBSD: distinfo,v 1.38 2025/11/19 15:54:26 gutteridge Exp $
BLAKE2s (lowdown-2.0.4.tar.gz) = 7d38d8b84eddc7587579c3a99880ac707c83fc067c1b2c16fa5afb95f4361da3
SHA512 (lowdown-2.0.4.tar.gz) = db396f738c3effdd55f112f2f71183b32b45ae2f8ba999e03df5162612e26a313d7b3ca1c5840cb71805f4429a4a3b67fe61a731aadc5cc989b74ff2da2d5b7e
Size (lowdown-2.0.4.tar.gz) = 697300 bytes
-SHA1 (patch-Makefile) = 27ccebda7d3e3770b4739e8bae27dd5b0692f5db
+SHA1 (patch-Makefile) = 2006a2e2f0aadff360dfa57cc5af2e2bbff4f3fb
Index: pkgsrc/textproc/lowdown/patches/patch-Makefile
diff -u pkgsrc/textproc/lowdown/patches/patch-Makefile:1.8 pkgsrc/textproc/lowdown/patches/patch-Makefile:1.9
--- pkgsrc/textproc/lowdown/patches/patch-Makefile:1.8 Wed Nov 19 14:36:03 2025
+++ pkgsrc/textproc/lowdown/patches/patch-Makefile Wed Nov 19 15:54:26 2025
@@ -1,10 +1,7 @@
-$NetBSD: patch-Makefile,v 1.8 2025/11/19 14:36:03 gutteridge Exp $
+$NetBSD: patch-Makefile,v 1.9 2025/11/19 15:54:26 gutteridge Exp $
Libtoolize for portable shared libraries.
-Don't "avoid exporting internal functions", as this causes any necessary
-compat functions to fail to link when generating the program itself.
-
--- Makefile.orig 2025-11-17 03:25:46.000000000 +0000
+++ Makefile
@@ -1,5 +1,6 @@
@@ -14,16 +11,7 @@ compat functions to fail to link when ge
include Makefile.configure
WWWDIR = /var/www/vhosts/kristaps.bsd.lv/htdocs/lowdown
-@@ -169,8 +170,6 @@ LIB_SOVER = liblowdown.$(LINKER_SOSUFFI
-
- # Because the objects will be compiled into a shared library:
- CFLAGS += -fPIC
--# To avoid exporting internal functions (lowdown.h has default visibility).
--CFLAGS += -fvisibility=hidden
-
- # Only for MarkdownTestv1.0.3 in regress/original.
-
-@@ -189,7 +188,12 @@ REGRESS_ARGS += "--parse-no-deflists"
+@@ -189,7 +190,12 @@ REGRESS_ARGS += "--parse-no-deflists"
REGRESS_ENV = LC_ALL=en_US.UTF-8
@@ -37,20 +25,20 @@ compat functions to fail to link when ge
bins: lowdown lowdown-diff
www: all $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
-@@ -202,15 +206,20 @@ installwww: www
+@@ -202,15 +208,20 @@ installwww: www
$(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
$(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
-lowdown: $(LIB_LOWDOWN) $(MAIN_OBJS) main.o
- $(CC) -o $@ main.o $(MAIN_OBJS) $(LIB_LOWDOWN) $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
-+lowdown: liblowdown.la $(MAIN_OBJS) main.o
-+ $(LIBTOOL) --mode=link $(CC) -o $@ main.o $(MAIN_OBJS) liblowdown.la $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
++lowdown: liblowdown.la $(LT_COMPAT_OBJS) main.o
++ $(LIBTOOL) --mode=link $(CC) -o $@ main.o $(LT_COMPAT_OBJS) liblowdown.la $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
+# For regress, we build this (just like lowdown) so that its libtool wrapper works.
+# At install, we'll still just make a hard link to lowdown like upstream.
lowdown-diff: lowdown
- ln -f lowdown lowdown-diff
-+ $(LIBTOOL) --mode=link $(CC) -o $@ main.o $(MAIN_OBJS) liblowdown.la $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
++ $(LIBTOOL) --mode=link $(CC) -o $@ main.o $(LT_COMPAT_OBJS) liblowdown.la $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
$(LIB_ST): $(OBJS) $(COMPAT_OBJS)
$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
@@ -61,7 +49,7 @@ compat functions to fail to link when ge
$(LIB_SO): $(OBJS) $(COMPAT_OBJS)
$(CC) $(LINKER_SOFLAG) -o $(LIB_SOVER) $(OBJS) $(COMPAT_OBJS) \
$(LDFLAGS) $(LDADD_MD5) -lm \
-@@ -240,8 +249,8 @@ install: bins
+@@ -240,8 +251,8 @@ install: bins
$(INSTALL_DATA) share/man/* $(DESTDIR)$(SHAREDIR)/lowdown/man
$(INSTALL_DATA) share/ms/* $(DESTDIR)$(SHAREDIR)/lowdown/ms
$(INSTALL_DATA) share/odt/* $(DESTDIR)$(SHAREDIR)/lowdown/odt
@@ -72,7 +60,7 @@ compat functions to fail to link when ge
for f in $(MAN1S) $(MAN5S) ; do \
name=`basename $$f .html` ; \
section=$${name##*.} ; \
-@@ -272,6 +281,9 @@ install_lib_common: lowdown.pc
+@@ -272,6 +283,9 @@ install_lib_common: lowdown.pc
uninstall_shared: uninstall_lib_common
rm -f $(LIBDIR)/$(LIB_SOVER) $(LIBDIR)/$(LIB_SO)
@@ -82,7 +70,7 @@ compat functions to fail to link when ge
install_shared: $(LIB_SO) install_lib_common
$(INSTALL_LIB) $(LIB_SOVER) $(DESTDIR)$(LIBDIR)
( cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIB_SOVER) $(LIB_SO) )
-@@ -344,6 +356,9 @@ diff.diff.pdf: diff.md diff.old.md lowdo
+@@ -344,6 +358,9 @@ diff.diff.pdf: diff.md diff.old.md lowdo
$(HTMLS): versions.xml lowdown
@@ -92,7 +80,7 @@ compat functions to fail to link when ge
.md.xml: lowdown
( echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" ; \
echo "<article data-sblg-article=\"1\">" ; \
-@@ -396,13 +411,13 @@ lowdown.tar.gz:
+@@ -396,13 +413,13 @@ lowdown.tar.gz:
( cd .dist/ && tar zcf ../$@ lowdown-$(VERSION) )
rm -rf .dist/
Home |
Main Index |
Thread Index |
Old Index