pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
sds: Update patch for Makefile
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Wed Jul 14 12:50:02 2021 +0200
Changeset: 6b1456a63e0717e95f901599dd978f01aab7f4f6
Modified Files:
sds/Makefile
sds/distinfo
sds/patches/patch-Makefile
Log Message:
sds: Update patch for Makefile
- Add test target
- Honor CPPFLAGS, CFLAGS and LDFLAGS
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6b1456a63e0717e95f901599dd978f01aab7f4f6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
sds/Makefile | 5 ++---
sds/distinfo | 8 ++------
sds/patches/patch-Makefile | 21 +++++++++++++--------
3 files changed, 17 insertions(+), 17 deletions(-)
diffs:
diff --git a/sds/Makefile b/sds/Makefile
index 2c0dc3f2a3..3e5dfe6d06 100644
--- a/sds/Makefile
+++ b/sds/Makefile
@@ -12,12 +12,11 @@ LICENSE= 2-clause-bsd
INSTALLATION_DIRS= lib include
+TEST_TARGET= test
+
do-install:
${INSTALL_LIB} ${WRKSRC}/libsds.so ${DESTDIR}${PREFIX}/lib/libsds.so
${INSTALL_DATA} ${WRKSRC}/sds.h ${DESTDIR}${PREFIX}/include/sds.h
-do-test:
- ${WRKSRC}/sds-test
-
.include "../../wip/mk/git-package.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sds/distinfo b/sds/distinfo
index 329a312142..41a3cf4d9d 100644
--- a/sds/distinfo
+++ b/sds/distinfo
@@ -1,7 +1,3 @@
-$NetBSD: distinfo,v 1.1 2015/07/10 21:24:03 travis-paul Exp $
+$NetBSD$
-SHA1 (sds/fb463145c9c245636feb28b5aac0fc897e16f67e.tar.gz) = 94597811fc0c0ea9bede88d4f0a9842825cddcb8
-RMD160 (sds/fb463145c9c245636feb28b5aac0fc897e16f67e.tar.gz) = 063fc4372dbd617658ff6aee32ec7a0c66ffda81
-SHA512 (sds/fb463145c9c245636feb28b5aac0fc897e16f67e.tar.gz) = 1a7a6c18584e08768dae5ac9628468df5b39ba362bab2715da0b0f4ce30286edcb9c66f85f1e32c86c4cbe0ea0bd6527c03361b66890558a43d4e3b6fd25f397
-Size (sds/fb463145c9c245636feb28b5aac0fc897e16f67e.tar.gz) = 25833 bytes
-SHA1 (patch-Makefile) = 95d581795ef4adb3ad2fe2cfdd566666bccb0540
+SHA1 (patch-Makefile) = 5c7ca7dfd44f04877e1fc932316c1f996660f246
diff --git a/sds/patches/patch-Makefile b/sds/patches/patch-Makefile
index 92d4f33c6d..7c4524d379 100644
--- a/sds/patches/patch-Makefile
+++ b/sds/patches/patch-Makefile
@@ -1,22 +1,27 @@
-$NetBSD: patch-Makefile,v 1.1 2015/07/10 21:24:03 travis-paul Exp $
+$NetBSD$
-* Add target for object file and shared object.
+* Add targets for object file, shared object and test.
+* Honor CPPFLAGS, CFLAGS and LDFLAGS
---- Makefile.orig 2014-02-06 16:10:16.000000000 +0000
+--- Makefile.orig 2021-07-14 10:28:45.000000000 +0000
+++ Makefile
-@@ -1,8 +1,14 @@
+@@ -1,8 +1,16 @@
-all: sds-test
+all: sds-test libsds.so
+
+sds.o: sds.c sds.h
-+ $(CC) -c -fpic -Wall -std=c99 -pedantic -O2 sds.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -fpic -Wall -std=c99 -pedantic -O2 sds.c
+
+libsds.so: sds.o
-+ $(CC) -shared -o libsds.so sds.o
++ $(CC) $(LDFLAGS) -shared -o libsds.so sds.o
sds-test: sds.c sds.h testhelp.h
- $(CC) -o sds-test sds.c -Wall -std=c99 -pedantic -O2 -DSDS_TEST_MAIN
- @echo ">>> Type ./sds-test to run the sds.c unit tests."
+- $(CC) -o sds-test sds.c -Wall -std=c99 -pedantic -O2 -DSDS_TEST_MAIN
+- @echo ">>> Type ./sds-test to run the sds.c unit tests."
++ $(CC) $(CPPFLAGS) $(CFLAGS) -o sds-test sds.c -Wall -std=c99 -pedantic -O2 -DSDS_TEST_MAIN
++
++test:
++ ./sds-test
clean:
- rm -f sds-test
Home |
Main Index |
Thread Index |
Old Index