pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Add support for CFLAGS and LDFLAGS
Module Name: pkgsrc-wip
Committed By: Pierre Pronchery <khorben%defora.org@localhost>
Pushed By: khorben
Date: Sun Jul 30 18:38:24 2017 +0200
Changeset: 3725501e98857e820bfc2b641e6b4e9ad72c32e3
Modified Files:
sloccount/Makefile
sloccount/distinfo
Added Files:
sloccount/patches/patch-makefile
Log Message:
Add support for 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=3725501e98857e820bfc2b641e6b4e9ad72c32e3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
sloccount/Makefile | 2 ++
sloccount/distinfo | 2 ++
sloccount/patches/patch-makefile | 61 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+)
diffs:
diff --git a/sloccount/Makefile b/sloccount/Makefile
index 90bdbf3690..781b24ac06 100644
--- a/sloccount/Makefile
+++ b/sloccount/Makefile
@@ -18,6 +18,8 @@ USE_TOOLS+= flex gunzip perl
MAKE_FILE= makefile
MAKE_FLAGS+= PREFIX=${PREFIX}
+MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
MAKE_FLAGS+= DESTDIR=${DESTDIR}
MAKE_FLAGS+= INSTALL_DIR=${DESTDIR}${PREFIX}/libexec/sloccount
diff --git a/sloccount/distinfo b/sloccount/distinfo
index 82cc24661b..f17751793e 100644
--- a/sloccount/distinfo
+++ b/sloccount/distinfo
@@ -2,5 +2,7 @@ $NetBSD: distinfo,v 1.3 2015/08/31 17:18:52 khorben Exp $
SHA1 (sloccount-2.26.tar.gz) = 505031c6adfb93e454aaf8b0ee7de04122079d13
RMD160 (sloccount-2.26.tar.gz) = a5bd1dbe8bd5e5c52ed790990c0d5d8fc49b26ff
+SHA512 (sloccount-2.26.tar.gz) = ed6ab315a56dbdc86c654b94e790c9ea9e2dcad0db26b63c0973c33eb7fa634b4ade0a1f3c6ccfd5172ea95f648c1dd3b0ae2575b0aa44b3fec708c24a6aca54
Size (sloccount-2.26.tar.gz) = 190948 bytes
+SHA1 (patch-makefile) = 67ee105f46bb15b219b0ef888594928b453fe407
SHA1 (patch-rpm__unpacker) = 1bd30245b1ad1c6de72c0ec63acbd76b95d79efb
diff --git a/sloccount/patches/patch-makefile b/sloccount/patches/patch-makefile
new file mode 100644
index 0000000000..0e34703893
--- /dev/null
+++ b/sloccount/patches/patch-makefile
@@ -0,0 +1,61 @@
+$NetBSD$
+
+Add support for CFLAGS and LDFLAGS
+
+--- /home/khorben/Projects/EdgeBSD/pkgsrc/work/wip/sloccount/work/sloccount-2.26/makefile.orig 2017-07-28 14:42:35.000000000 +0000
++++ /home/khorben/Projects/EdgeBSD/pkgsrc/work/wip/sloccount/work/sloccount-2.26/makefile
+@@ -37,7 +37,9 @@ EXE_SUFFIX=
+ # Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc".
+ # The "-Wall" option turns on warnings in gcc. gcc users might also want
+ # to consider using "-Werror", which turns warnings into errors.
+-CC=gcc -Wall
++CC=gcc
++CFLAGS=-Wall
++LDFLAGS=
+
+ # Set this to the name of your "install" program. On some systems,
+ # "install -C" would be useful (so unchanged files won't be modified),
+@@ -128,28 +130,28 @@ MYDOCS=sloccount.html README TODO Change
+ all: $(COMPILED_EXECUTABLES)
+
+ lexcount1$(EXE_SUFFIX): lexcount1.c
+- $(CC) lexcount1.c -o lexcount1$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(LDFLAGS) lexcount1.c -o lexcount1$(EXE_SUFFIX)
+
+ c_count$(EXE_SUFFIX): c_count.c
+- $(CC) c_count.c -o c_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(LDFLAGS) c_count.c -o c_count$(EXE_SUFFIX)
+
+ php_count$(EXE_SUFFIX): php_count.c
+- $(CC) php_count.c -o php_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(LDFLAGS) php_count.c -o php_count$(EXE_SUFFIX)
+
+ pascal_count.c: pascal_count.l driver.c driver.h
+ flex -Cfe -t pascal_count.l > pascal_count.c
+
+ pascal_count$(EXE_SUFFIX): pascal_count.c
+- $(CC) pascal_count.c -o pascal_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(LDFLAGS) pascal_count.c -o pascal_count$(EXE_SUFFIX)
+
+ jsp_count.c: jsp_count.l driver.c driver.h
+ flex -Cfe -t jsp_count.l > jsp_count.c
+
+ jsp_count$(EXE_SUFFIX): jsp_count.c
+- $(CC) jsp_count.c -o jsp_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(LDFLAGS) jsp_count.c -o jsp_count$(EXE_SUFFIX)
+
+ ml_count$(EXE_SUFFIX): ml_count.c
+- $(CC) ml_count.c -o ml_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(LDFLAGS) ml_count.c -o ml_count$(EXE_SUFFIX)
+
+ sloccount.1.gz: sloccount.1
+ gzip -c sloccount.1 > sloccount.1.gz
+@@ -160,7 +162,7 @@ java_count$(EXE_SUFFIX): c_count$(EXE_SU
+
+ # This is USC's code counter, not built by default:
+ c_lines: C_LINES.C
+- $(CC) C_LINES.C -o c_lines$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(LDFLAGS) C_LINES.C -o c_lines$(EXE_SUFFIX)
+
+
+ install_programs: all
Home |
Main Index |
Thread Index |
Old Index