pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

honggfuzz-git: Drop local patch



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Aug 10 12:49:33 2018 +0200
Changeset:	1b4d8e9d49767e151dd8e02789ec563cac02f74f

Modified Files:
	honggfuzz-git/distinfo
Removed Files:
	honggfuzz-git/patches/patch-hfuzz__cc_hfuzz-cc.c

Log Message:
honggfuzz-git: Drop local patch

Merged upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1b4d8e9d49767e151dd8e02789ec563cac02f74f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 honggfuzz-git/distinfo                           |  1 -
 honggfuzz-git/patches/patch-hfuzz__cc_hfuzz-cc.c | 97 ------------------------
 2 files changed, 98 deletions(-)

diffs:
diff --git a/honggfuzz-git/distinfo b/honggfuzz-git/distinfo
index 067768e088..ed185c6986 100644
--- a/honggfuzz-git/distinfo
+++ b/honggfuzz-git/distinfo
@@ -4,4 +4,3 @@ SHA1 (honggfuzz-1.6.tar.gz) = e6ab2a411fe8726e57815209d6fb1b6f4268538c
 RMD160 (honggfuzz-1.6.tar.gz) = 8ef15a0e38cd09a26f82a3683da6a363257ddce1
 SHA512 (honggfuzz-1.6.tar.gz) = db4f0f31d36080db983068435be82b3e1132145e0bad5c4e8e6504563f10ce66df4f977fbd0a9f1cbcd262e479f635a68ab7c1df70d23e8437164734ea562c90
 Size (honggfuzz-1.6.tar.gz) = 79322453 bytes
-SHA1 (patch-hfuzz__cc_hfuzz-cc.c) = 1351c251a5aa58cfbe510de6f92362cc4c465e4e
diff --git a/honggfuzz-git/patches/patch-hfuzz__cc_hfuzz-cc.c b/honggfuzz-git/patches/patch-hfuzz__cc_hfuzz-cc.c
deleted file mode 100644
index c616192d87..0000000000
--- a/honggfuzz-git/patches/patch-hfuzz__cc_hfuzz-cc.c
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD$
-
---- hfuzz_cc/hfuzz-cc.c.orig	2018-04-19 13:37:38.000000000 +0000
-+++ hfuzz_cc/hfuzz-cc.c
-@@ -102,6 +102,13 @@ static bool isLDMode(int argc, char** ar
-     return true;
- }
- 
-+static int
-+hf_execvp(const char *file, char *argv[])
-+{
-+	argv[0] = (char *)file;
-+	return execvp(file, argv);
-+}
-+
- static int execCC(int argc, char** argv) {
-     if (useASAN()) {
-         argv[argc++] = "-fsanitize=address";
-@@ -117,14 +124,14 @@ static int execCC(int argc, char** argv)
-     if (isCXX) {
-         const char* cxx_path = getenv("HFUZZ_CXX_PATH");
-         if (cxx_path != NULL) {
--            execvp(cxx_path, argv);
-+            hf_execvp(cxx_path, argv);
-             PLOG_E("execvp('%s')", cxx_path);
-             return EXIT_FAILURE;
-         }
-     } else {
-         const char* cc_path = getenv("HFUZZ_CC_PATH");
-         if (cc_path != NULL) {
--            execvp(cc_path, argv);
-+            hf_execvp(cc_path, argv);
-             PLOG_E("execvp('%s')", cc_path);
-             return EXIT_FAILURE;
-         }
-@@ -132,37 +139,37 @@ static int execCC(int argc, char** argv)
- 
-     if (isGCC) {
-         if (isCXX) {
--            execvp("g++", argv);
--            execvp("gcc", argv);
-+            hf_execvp("g++", argv);
-+            hf_execvp("gcc", argv);
-         } else {
--            execvp("gcc", argv);
-+            hf_execvp("gcc", argv);
-         }
-     } else {
-         if (isCXX) {
-             /* Try the default one, then newest ones (hopefully) first */
--            execvp("clang++", argv);
--            execvp("clang++-devel", argv);
--            execvp("clang++-10.0", argv);
--            execvp("clang++-9.0", argv);
--            execvp("clang++-8.0", argv);
--            execvp("clang++-7.0", argv);
--            execvp("clang++-7", argv);
--            execvp("clang++-6.0", argv);
--            execvp("clang++-5.0", argv);
--            execvp("clang++-4.0", argv);
--            execvp("clang", argv);
-+            hf_execvp("clang++", argv);
-+            hf_execvp("clang++-devel", argv);
-+            hf_execvp("clang++-10.0", argv);
-+            hf_execvp("clang++-9.0", argv);
-+            hf_execvp("clang++-8.0", argv);
-+            hf_execvp("clang++-7.0", argv);
-+            hf_execvp("clang++-7", argv);
-+            hf_execvp("clang++-6.0", argv);
-+            hf_execvp("clang++-5.0", argv);
-+            hf_execvp("clang++-4.0", argv);
-+            hf_execvp("clang", argv);
-         } else {
-             /* Try the default one, then newest ones (hopefully) first */
--            execvp("clang", argv);
--            execvp("clang-devel", argv);
--            execvp("clang-10.0", argv);
--            execvp("clang-9.0", argv);
--            execvp("clang-8.0", argv);
--            execvp("clang-7.0", argv);
--            execvp("clang-7", argv);
--            execvp("clang-6.0", argv);
--            execvp("clang-5.0", argv);
--            execvp("clang-4.0", argv);
-+            hf_execvp("clang", argv);
-+            hf_execvp("clang-devel", argv);
-+            hf_execvp("clang-10.0", argv);
-+            hf_execvp("clang-9.0", argv);
-+            hf_execvp("clang-8.0", argv);
-+            hf_execvp("clang-7.0", argv);
-+            hf_execvp("clang-7", argv);
-+            hf_execvp("clang-6.0", argv);
-+            hf_execvp("clang-5.0", argv);
-+            hf_execvp("clang-4.0", argv);
-         }
-     }
- 


Home | Main Index | Thread Index | Old Index