pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/syncdir Extract libtool patch. Since OS X has de...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f318c75a553b
branches: trunk
changeset: 326177:f318c75a553b
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sat Dec 01 14:58:49 2018 +0000
description:
Extract libtool patch. Since OS X has deprecated syscall() in 10.12,
add my patch to use dlsym() if compiling with syscall() gives warnings
or errors. Bump PKGREVISION.
diffstat:
devel/syncdir/Makefile | 12 +++++-
devel/syncdir/distinfo | 13 ++++--
devel/syncdir/patches/patch-Makefile | 67 ----------------------------------
devel/syncdir/patches/patch-syncdir.c | 15 -------
devel/syncdir/patches/patch-testsync.c | 15 -------
5 files changed, 19 insertions(+), 103 deletions(-)
diffs (160 lines):
diff -r e8986c63f2a7 -r f318c75a553b devel/syncdir/Makefile
--- a/devel/syncdir/Makefile Sat Dec 01 14:31:19 2018 +0000
+++ b/devel/syncdir/Makefile Sat Dec 01 14:58:49 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2018/11/12 17:54:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2018/12/01 14:58:49 schmonz Exp $
#
DISTNAME= syncdir-1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${HOMEPAGE}
@@ -13,6 +13,14 @@
USE_LIBTOOL= yes
+LIBTOOL_PATCH= syncdir-1.0-libtoolize-20181112.patch
+PATCHFILES+= ${LIBTOOL_PATCH}
+SITES.${LIBTOOL_PATCH}= https://schmonz.com/qmail/syncdirlibtool/
+
+DLSYM_PATCH= syncdir-1.0-libtoolize-20181112-dlsym-20181112.patch
+PATCHFILES+= ${DLSYM_PATCH}
+SITES.${DLSYM_PATCH}= https://schmonz.com/qmail/syncdirdlsym/
+
INSTALLATION_DIRS= lib
.include "../../mk/bsd.prefs.mk"
diff -r e8986c63f2a7 -r f318c75a553b devel/syncdir/distinfo
--- a/devel/syncdir/distinfo Sat Dec 01 14:31:19 2018 +0000
+++ b/devel/syncdir/distinfo Sat Dec 01 14:58:49 2018 +0000
@@ -1,9 +1,14 @@
-$NetBSD: distinfo,v 1.6 2018/11/12 17:54:40 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2018/12/01 14:58:49 schmonz Exp $
+SHA1 (syncdir-1.0-libtoolize-20181112-dlsym-20181112.patch) = bfcaeaee0080d4b27983b800efc4370f186b8b37
+RMD160 (syncdir-1.0-libtoolize-20181112-dlsym-20181112.patch) = 194c7061b0a0eb97a69c5aed049b4f5c833cbf50
+SHA512 (syncdir-1.0-libtoolize-20181112-dlsym-20181112.patch) = 47e0de97c0256b5c8deda0d84bc1df874873819e31a90b41bee4dc1160e48d9a1dfe7d51fbff98458d68655624a621d7215b99b15cc7ec0de6faef1e936af2a3
+Size (syncdir-1.0-libtoolize-20181112-dlsym-20181112.patch) = 5776 bytes
+SHA1 (syncdir-1.0-libtoolize-20181112.patch) = 811fd4ccb69b3b255485c1667c95b30a12e96e17
+RMD160 (syncdir-1.0-libtoolize-20181112.patch) = 50ced2ee85ac81f55e90f95e8fafeb8fb5518204
+SHA512 (syncdir-1.0-libtoolize-20181112.patch) = 67881906547d4928e939e5b35ecb8a26b07affd4946522473639aa7c346279bfbb27680a7c500ad3030cd4f5fb840e1c452f9e825f9bd5ee4f8e85ced335b408
+Size (syncdir-1.0-libtoolize-20181112.patch) = 2163 bytes
SHA1 (syncdir-1.0.tar.gz) = fdc3e282acd4af15e9bffb343ee825d69dde162e
RMD160 (syncdir-1.0.tar.gz) = b032a8481529c54b4ac149fdf98ad888e0a392f0
SHA512 (syncdir-1.0.tar.gz) = 0b5262e23e43f34be7bc31ed6baf7624a115a509e459504651b184a0856c7918671db4be1b8e14552f275c49c5c6bbc00d786c57f1d96548a491048674f58317
Size (syncdir-1.0.tar.gz) = 8878 bytes
-SHA1 (patch-Makefile) = ed9063d6359f4dc8cf905cb85b14e830a65832d9
-SHA1 (patch-syncdir.c) = eb289d0fd2fa29adb941899603835a14df4bc4f0
-SHA1 (patch-testsync.c) = 03f536c6ba1af64c9dca6735ce8cc58a1270bc3f
diff -r e8986c63f2a7 -r f318c75a553b devel/syncdir/patches/patch-Makefile
--- a/devel/syncdir/patches/patch-Makefile Sat Dec 01 14:31:19 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2018/11/12 17:54:40 schmonz Exp $
-
-Libtoolize for portability.
-
---- Makefile.orig 1998-07-13 19:33:23.000000000 +0000
-+++ Makefile
-@@ -1,34 +1,33 @@
- VERSION = 1.0
-
--CFLAGS = -O2 -Wall -g
--CC = gcc
--LDFLAGS =
--LD = $(CC)
--prefix = /usr
-+CFLAGS ?= -O2 -Wall -g
-+CC ?= gcc
-+LDFLAGS ?=
-+LD ?= $(CC)
-+prefix = $(PREFIX)
- libdir = $(prefix)/lib
-
--OBJS = syncdir.o
- LOBJS = syncdir.lo
-
--all: libsyncdir.so libsyncdir.a
-+LIBTOOL = libtool --tag=CC
-
--testsync: testsync.o libsyncdir.a
-- $(LD) $(LDFLAGS) -o $@ $< libsyncdir.a
-+all: libsyncdir.la
-
--libsyncdir.so: $(LOBJS)
-- $(LD) $(LDFLAGS) -shared -Wl,-soname,libsyncdir.so \
-- -o libsyncdir.so $(LOBJS)
-+.SUFFIXES: .lo
-+.c.lo:
-+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-
--syncdir.lo: syncdir.c
-- $(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
--syncdir.o: syncdir.c
-+testsync: testsync.lo libsyncdir.la
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $< libsyncdir.la
-
--libsyncdir.a: $(OBJS)
-- ar r libsyncdir.a $(OBJS)
-+libsyncdir.la: libtool-version-info $(LOBJS)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) -version-info `cat libtool-version-info` -rpath $(libdir)
-+
-+libtool-version-info:
-+ echo $(VERSION) | awk -F. '{ printf "%d:%d:0", $$1, $$2 }' > $@
-
- install: all
-- install -m 755 libsyncdir.so $(libdir)
-- install -m 644 libsyncdir.a $(libdir)
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) libsyncdir.la $(DESTDIR)$(libdir)
-
- TARGET = syncdir-$(VERSION)
- FILES = Makefile COPYING syncdir.c syncdir.spec testsync.c
-@@ -39,5 +38,5 @@ distrib:
- $(RM) -r $(TARGET)
-
- clean:
-- $(RM) core *.o *.lo *.so *.a testsync $(TARGET).tar.gz
--
-+ $(RM) libtool-version-info core *.o *.lo *.la *.so *.a testsync $(TARGET).tar.gz
-+ $(RM) -r .libs
diff -r e8986c63f2a7 -r f318c75a553b devel/syncdir/patches/patch-syncdir.c
--- a/devel/syncdir/patches/patch-syncdir.c Sat Dec 01 14:31:19 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-syncdir.c,v 1.1 2017/07/20 02:07:27 schmonz Exp $
-
-Avoid a Linuxism.
-
---- syncdir.c.orig 1998-07-13 19:29:57.000000000 +0000
-+++ syncdir.c
-@@ -25,7 +25,7 @@
- #undef open
- #include <unistd.h>
- #include <string.h>
--#include <syscall.h>
-+#include <sys/syscall.h>
- #include <stdio.h>
- #include <errno.h>
-
diff -r e8986c63f2a7 -r f318c75a553b devel/syncdir/patches/patch-testsync.c
--- a/devel/syncdir/patches/patch-testsync.c Sat Dec 01 14:31:19 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-testsync.c,v 1.1 2018/11/12 17:54:40 schmonz Exp $
-
-Libtoolize.
-
---- testsync.c.orig 1998-07-13 19:43:05.000000000 +0000
-+++ testsync.c
-@@ -2,7 +2,7 @@
- #include <fcntl.h>
- #include <string.h>
-
--inline void msg(const char* m)
-+void msg(const char* m)
- {
- write(1, m, strlen(m));
- }
Home |
Main Index |
Thread Index |
Old Index