diff options
| author | fjoe <fjoe@FreeBSD.org> | 2006-11-14 12:33:04 +0800 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2006-11-14 12:33:04 +0800 |
| commit | db84827f4d6a99fcc9d8037508572361572904dc (patch) | |
| tree | 828447920e6078bcacd5e90b8ffb061a4260b810 /emulators | |
| parent | a5c8cb2d8ffa3df71e727f6640a588215a0f9618 (diff) | |
| download | freebsd-ports-gnome-db84827f4d6a99fcc9d8037508572361572904dc.tar.gz freebsd-ports-gnome-db84827f4d6a99fcc9d8037508572361572904dc.tar.zst freebsd-ports-gnome-db84827f4d6a99fcc9d8037508572361572904dc.zip | |
Fix the build on RLEENG_4.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/dynamips-devel/Makefile | 4 | ||||
| -rw-r--r-- | emulators/dynamips-devel/files/patch-Makefile | 4 | ||||
| -rw-r--r-- | emulators/dynamips/Makefile | 4 | ||||
| -rw-r--r-- | emulators/dynamips/files/patch-Makefile | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/emulators/dynamips-devel/Makefile b/emulators/dynamips-devel/Makefile index 08561b3c1285..497591cc9e33 100644 --- a/emulators/dynamips-devel/Makefile +++ b/emulators/dynamips-devel/Makefile @@ -18,10 +18,12 @@ LIB_DEPENDS= elf.0:${PORTSDIR}/devel/libelf USE_GMAKE= yes USE_GCC= 3.2+ +USE_GETOPT_LONG=yes ALL_TARGET= ${PORTNAME} MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\ PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS}\ + LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/${PORTNAME} .if !defined(NOPORTDOCS) diff --git a/emulators/dynamips-devel/files/patch-Makefile b/emulators/dynamips-devel/files/patch-Makefile index 088a8e3cced2..8f90939acbd7 100644 --- a/emulators/dynamips-devel/files/patch-Makefile +++ b/emulators/dynamips-devel/files/patch-Makefile @@ -1,5 +1,5 @@ --- Makefile.orig Thu Sep 14 17:59:13 2006 -+++ Makefile Wed Oct 18 22:38:24 2006 ++++ Makefile Tue Nov 14 10:27:26 2006 @@ -12,6 +12,9 @@ # (WinPcap is used for Cygwin) HAS_PCAP?=1 @@ -28,7 +28,7 @@ - LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) + LOCALBASE?=/usr/local + CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf $(PTHREAD_CFLAGS) -+ LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) ++ LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) $(LDFLAGS) else ifeq ($(shell uname -s), Darwin) CFLAGS+=-I/usr/local/include -mdynamic-no-pic diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile index 08561b3c1285..497591cc9e33 100644 --- a/emulators/dynamips/Makefile +++ b/emulators/dynamips/Makefile @@ -18,10 +18,12 @@ LIB_DEPENDS= elf.0:${PORTSDIR}/devel/libelf USE_GMAKE= yes USE_GCC= 3.2+ +USE_GETOPT_LONG=yes ALL_TARGET= ${PORTNAME} MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\ PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\ - PTHREAD_LIBS=${PTHREAD_LIBS} + PTHREAD_LIBS=${PTHREAD_LIBS}\ + LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/${PORTNAME} .if !defined(NOPORTDOCS) diff --git a/emulators/dynamips/files/patch-Makefile b/emulators/dynamips/files/patch-Makefile index 088a8e3cced2..8f90939acbd7 100644 --- a/emulators/dynamips/files/patch-Makefile +++ b/emulators/dynamips/files/patch-Makefile @@ -1,5 +1,5 @@ --- Makefile.orig Thu Sep 14 17:59:13 2006 -+++ Makefile Wed Oct 18 22:38:24 2006 ++++ Makefile Tue Nov 14 10:27:26 2006 @@ -12,6 +12,9 @@ # (WinPcap is used for Cygwin) HAS_PCAP?=1 @@ -28,7 +28,7 @@ - LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) + LOCALBASE?=/usr/local + CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf $(PTHREAD_CFLAGS) -+ LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) ++ LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) $(LDFLAGS) else ifeq ($(shell uname -s), Darwin) CFLAGS+=-I/usr/local/include -mdynamic-no-pic |