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

Fix to prevent use of expat

Browse Source
This commit is contained in:
couderc 2002-09-14 14:46:32 +00:00
parent 1cbd422db3
commit d0089829bf
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net/openh323/patches/patch-pwlib_make_unix_mak
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pwlib_make_unix_mak,v 1.2 2002/09/05 17:57:30 couderc Exp $
$OpenBSD: patch-pwlib_make_unix_mak,v 1.3 2002/09/14 14:46:32 couderc Exp $
--- pwlib/make/unix.mak.orig Thu Apr 18 07:12:20 2002
+++ pwlib/make/unix.mak Thu Aug 29 15:44:59 2002
@@ -668,21 +668,21 @@ ifeq ($(OSTYPE),OpenBSD)
+++ pwlib/make/unix.mak Sat Sep 14 12:27:12 2002
@@ -668,24 +668,24 @@ ifeq ($(OSTYPE),OpenBSD)
P_PTHREADS := 1
@ -30,6 +30,10 @@ $OpenBSD: patch-pwlib_make_unix_mak,v 1.2 2002/09/05 17:57:30 couderc Exp $
+#endif
P_USE_RANLIB := 1
-
+HAS_EXPAT := 0
endif # OpenBSD
@@ -1106,7 +1106,7 @@ endif
PW_LIBDIR = $(PWLIBDIR)/lib
@ -50,3 +54,34 @@ $OpenBSD: patch-pwlib_make_unix_mak,v 1.2 2002/09/05 17:57:30 couderc Exp $
#OPTCCFLAGS += -DP_USE_INLINES=1
#OPTCCFLAGS += -fconserve-space
ifneq ($(OSTYPE),Carbon)
@@ -1172,18 +1173,18 @@ endif
# define expat (XML parser) variables if installed
-ifneq (,$(wildcard $(SYSINCDIR)/expat.h))
-HAS_EXPAT = 1
-ENDLDLIBS += -lexpat
-STDCCFLAGS += -DP_EXPAT
-endif
-
-ifneq (,$(wildcard /usr/local/include/expat.h))
-HAS_EXPAT = 1
-ENDLDLIBS += -lexpat
-STDCCFLAGS += -DP_EXPAT -I /usr/local/include
-LDFLAGS += -L /usr/local/lib
-endif
+# ifneq (,$(wildcard $(SYSINCDIR)/expat.h))
+# HAS_EXPAT = 1
+# ENDLDLIBS += -lexpat
+# STDCCFLAGS += -DP_EXPAT
+# endif
+
+# ifneq (,$(wildcard /usr/local/include/expat.h))
+# HAS_EXPAT = 1
+# ENDLDLIBS += -lexpat
+# STDCCFLAGS += -DP_EXPAT -I /usr/local/include
+# LDFLAGS += -L /usr/local/lib
+# endif
# define ESDDIR variables if installed