63 lines
2.9 KiB
Plaintext
63 lines
2.9 KiB
Plaintext
$NetBSD: patch-am,v 1.3 2015/12/25 20:12:16 joerg Exp $
|
|
|
|
--- source/aimk.orig 2012-05-23 19:05:00.000000000 +0000
|
|
+++ source/aimk
|
|
@@ -422,7 +422,7 @@ set SPOOLING_DEPS = "spoolloaderlib sp
|
|
# we generate a berkeley db shared lib, so we need bdb include and lib path
|
|
set CFLAGS = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS"
|
|
set LFLAGS = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS"
|
|
-set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}"
|
|
+set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} -R$BERKELEYDB_HOME/lib"
|
|
|
|
# JUTI Targets
|
|
set JUTI_ALL = juti_all
|
|
@@ -1301,11 +1301,11 @@ case FREEBSD_*:
|
|
set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
|
|
set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
|
|
set NOERR_CFLAG = "-Wno-error"
|
|
- set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic"
|
|
+ set LFLAGS = "$DEBUG_FLAG $LFLAGS -Wl,-export-dynamic"
|
|
set LIBS = "$LIBS -lkvm"
|
|
set SHAREDLD = $CC
|
|
set SHARED_CFLAGS = "-fPIC"
|
|
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
|
|
+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
|
|
set AUTHLIBS = "-lcrypt -lpam"
|
|
|
|
set XMTDEF = ""
|
|
@@ -1334,20 +1334,20 @@ case NETBSD_*:
|
|
set CXX = g++
|
|
set DLLIB = ""
|
|
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
|
|
- set CFLAGS = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
|
|
+ set CFLAGS = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include"
|
|
set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
|
|
set NOERR_CFLAG = "-Wno-error"
|
|
- set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic"
|
|
+ set LFLAGS = "$DEBUG_FLAG $LFLAGS -Wl,-export-dynamic -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
|
|
set LIBS = "$LIBS -lkvm"
|
|
set SHAREDLD = $CC
|
|
set SHARED_CFLAGS = "-fPIC"
|
|
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
|
|
+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
|
|
set AUTHLIBS = "-lcrypt -lpam"
|
|
|
|
set XMTDEF = ""
|
|
- set XINCD = "$XMTINCD $XINCD -I/usr/X11/include -I/usr/pkg/include"
|
|
+ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include"
|
|
set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD $XCFLAGS"
|
|
- set XLIBD = "-L/usr/X11R6/lib -R/usr/X11R6/lib -L/usr/pkg/lib -R /usr/pkg/lib"
|
|
+ set XLIBD = "-L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R ${LOCALBASE}/lib"
|
|
set XLFLAGS = "$XLIBD"
|
|
set XLIBS = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
|
|
set XMLIBS = "$XLIBS"
|
|
@@ -2519,7 +2519,7 @@ if ( "$BUILDMAN" == 1 ) then
|
|
exit 1
|
|
endif
|
|
|
|
- $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE $BUILDMAN $BUILDHTMLMAN $KVMAN
|
|
+ $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE 0 $BUILDHTMLMAN $KVMAN
|
|
|
|
if ( $status != 0 ) then
|
|
echo not done
|