2002-09-05 13:57:30 -04:00
|
|
|
$OpenBSD: patch-pwlib_make_unix_mak,v 1.2 2002/09/05 17:57:30 couderc Exp $
|
2002-08-02 17:28:34 -04:00
|
|
|
--- pwlib/make/unix.mak.orig Thu Apr 18 07:12:20 2002
|
2002-09-05 13:57:30 -04:00
|
|
|
+++ pwlib/make/unix.mak Thu Aug 29 15:44:59 2002
|
|
|
|
|
@@ -668,21 +668,21 @@ ifeq ($(OSTYPE),OpenBSD)
|
|
|
|
|
|
|
|
|
|
P_PTHREADS := 1
|
|
|
|
|
|
|
|
|
|
-ifeq ($(MACHTYPE),x86)
|
|
|
|
|
-STDCCFLAGS += -m486
|
|
|
|
|
-endif
|
|
|
|
|
-
|
|
|
|
|
LDLIBS += -lossaudio
|
|
|
|
|
|
|
|
|
|
-ifndef OSRELASE
|
|
|
|
|
+ifndef OSRELEASE
|
|
|
|
|
OSRELEASE := $(shell sysctl -n kern.osrevision)
|
|
|
|
|
endif
|
|
|
|
|
-
|
|
|
|
|
+
|
|
|
|
|
+CC := ${CC}
|
|
|
|
|
+CPLUS := ${CXX}
|
|
|
|
|
+CFLAGS += ${CFLAGS}
|
|
|
|
|
+ENDIAN := ${ENDIAN}
|
|
|
|
|
STDCCFLAGS += -DP_OPENBSD=$(OSRELEASE)
|
|
|
|
|
|
|
|
|
|
-ifdef P_PTHREADS
|
|
|
|
|
+#ifdef P_PTHREADS
|
|
|
|
|
CFLAGS += -pthread
|
|
|
|
|
-endif
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
P_USE_RANLIB := 1
|
|
|
|
|
|
2002-08-02 17:28:34 -04:00
|
|
|
@@ -1106,7 +1106,7 @@ endif
|
2002-07-28 15:35:51 -04:00
|
|
|
PW_LIBDIR = $(PWLIBDIR)/lib
|
|
|
|
|
|
|
|
|
|
# set name of the PT library
|
|
|
|
|
-PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
|
|
|
|
|
+PTLIB_BASE = pt
|
|
|
|
|
PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
|
|
|
|
|
PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
|
|
|
|
|
PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE)
|
2002-09-05 13:57:30 -04:00
|
|
|
@@ -1133,7 +1133,8 @@ LDFLAGS += $(DEBLDFLAGS)
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
-OPTCCFLAGS += -O3 -DNDEBUG
|
|
|
|
|
+OPTCCFLAGS += -DNDEBUG
|
|
|
|
|
+#OPTCCFLAGS += -O3 -DNDEBUG
|
|
|
|
|
#OPTCCFLAGS += -DP_USE_INLINES=1
|
|
|
|
|
#OPTCCFLAGS += -fconserve-space
|
|
|
|
|
ifneq ($(OSTYPE),Carbon)
|
