cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove chunks from the regress tests' Makefile, drops gmake dependency

Browse Source 
and those chunks never applied to us anyway
This commit is contained in:
jasper 2009-03-26 22:09:53 +00:00
parent 5d9dcee892
commit 7a74c5fbba
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/uthash/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2009/03/26 21:59:25 jasper Exp $
# $OpenBSD: Makefile,v 1.5 2009/03/26 22:09:53 jasper Exp $
COMMENT= C macros to add, find and delete items from a hash
@ -17,8 +17,6 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=uthash/}
EXTRACT_SUFX= .tar.bz2
USE_GMAKE= Yes
NO_BUILD= Yes
PKG_ARCH= *

36
devel/uthash/patches/patch-tests_Makefile
View File

@ -1,6 +1,10 @@
$OpenBSD: patch-tests_Makefile,v 1.4 2009/03/26 22:09:53 jasper Exp $
- Remove GNU make crap that never applied to us anyway.
--- tests/Makefile.orig Thu Feb 19 11:41:01 2009
+++ tests/Makefile Sat Mar 21 23:06:19 2009
@@ -4,14 +4,10 @@
+++ tests/Makefile Thu Mar 26 23:06:05 2009
@@ -4,37 +4,18 @@ UTILS = emit_keys
PROGS = test1 test2 test3 test4 test5 test6 test7 test8 test9 \
test10 test11 test12 test13 test14 test15 test16 test17 \
test18 test19 test20 test21 test22 test23 test24
@ -15,21 +19,33 @@
-CFLAGS += -DHASH_DEBUG=1
-endif
-
ifeq ($(HASH_PEDANTIC),1)
CFLAGS += -pedantic
endif
@@ -24,10 +20,11 @@
CFLAGS += -m64
endif
-ifeq ($(HASH_PEDANTIC),1)
-CFLAGS += -pedantic
-endif
-
TEST_TARGET=run_tests
TESTS=./do_tests
-# Prefer 64-bit compilation on Mac OS X (not necessary, just faster)
-ifneq ($(strip $(shell $(CC) -v 2>&1 |egrep "i[0-9]+-apple-darwin")),)
- CFLAGS += -m64
-endif
-
+# gnu make idiom...
# detect Cygwin
-ifneq ($(strip $(shell $(CC) -v 2>&1 |grep "cygwin")),)
- TESTS=./do_tests.cygwin
-endif
-
-# detect MinGW
-ifneq ($(strip $(shell $(CC) -v 2>&1 |grep "mingw")),)
- TEST_TARGET=run_tests_mingw
- TESTS=./do_tests.mingw
-endif
-
+#ifneq ($(strip $(shell $(CC) -v 2>&1 |grep "cygwin")),)
+# TESTS=./do_tests.cygwin
+#endif
# detect MinGW
ifneq ($(strip $(shell $(CC) -v 2>&1 |grep "mingw")),)
all: $(PROGS) $(UTILS) $(FUNCS) $(TEST_TARGET)