c65335346c
- use new style C++ includes
- clean up some patches
- use __alignof__ for OpenBSD too
- fix destpath in packagelist.txt for sdkoo and ure
- don't generate core file on intentional segfault test in typesconfig.c
- add missing unxobsdi section in stand.lst
- num_put_float.cpp fix in STLport
- add sysconfig.get_config_var('LIBS') to PYTHON_LIBS
- don't hardcode Linux path to 'sum' let path find it
All corrections submitted by or inspired by patches from Fritz Elfert
<fritz at fritz-elfert.de>
49 lines
1.4 KiB
Plaintext
49 lines
1.4 KiB
Plaintext
$OpenBSD: patch-vcl_util_makefile_mk,v 1.3 2006/10/25 22:49:50 kurt Exp $
|
|
--- vcl/util/makefile.mk.orig.port Tue Aug 1 05:30:37 2006
|
|
+++ vcl/util/makefile.mk Wed Oct 25 09:14:34 2006
|
|
@@ -186,7 +186,7 @@ SHL1USE_EXPORTS=ordinal
|
|
SHL1LIBS= $(LIB1TARGET)
|
|
.IF "$(GUI)"!="UNX"
|
|
SHL1OBJS= $(SLO)$/salshl.obj
|
|
-.ELIF "$(OS)"!="FREEBSD"
|
|
+.ELIF "$(OS)"!="FREEBSD" && "$(OS)"!="OPENBSD"
|
|
SHL1STDLIBS+=-ldl
|
|
.ENDIF
|
|
|
|
@@ -226,7 +226,7 @@ LINKFLAGSSHL += /ENTRY:LibMain@12
|
|
|
|
.IF "$(GUI)"=="UNX"
|
|
|
|
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
|
|
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="OPENBSD"
|
|
SHL1STDLIBS+= -ldl
|
|
.ENDIF
|
|
|
|
@@ -315,7 +315,7 @@ SHL2STDLIBS+=$(LIBSN_LIBS)
|
|
.ENDIF
|
|
|
|
SHL2STDLIBS += -lXext -lSM -lICE -lX11
|
|
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
|
|
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="OPENBSD"
|
|
# needed by salprnpsp.cxx
|
|
SHL2STDLIBS+= -ldl
|
|
.ENDIF
|
|
@@ -371,7 +371,7 @@ SHL4NOCHECK=TRUE
|
|
|
|
|
|
SHL4STDLIBS+=-l$(SHL2TARGET)
|
|
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
|
|
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="OPENBSD"
|
|
SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
|
|
.ELSE
|
|
SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
|
|
@@ -389,7 +389,7 @@ SHL5DEPN=$(SHL2TARGETN)
|
|
# libs for KDE plugin
|
|
SHL5STDLIBS=$(KDE_LIBS)
|
|
SHL5STDLIBS+=-l$(SHL2TARGET)
|
|
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
|
|
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="OPENBSD"
|
|
SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
|
|
.ELSE
|
|
SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
|