diff options
| author | rin <rin> | 2017-02-23 10:18:06 +0000 |
|---|---|---|
| committer | rin <rin> | 2017-02-23 10:18:06 +0000 |
| commit | dff1826012a1738f99fedea97ac1faa239fe2955 (patch) | |
| tree | 4e476af99bfcf39e2efb37e15cf569f41691eb86 /emulators | |
| parent | 18c19384137e3577a67dba7a084eed5d8a09890c (diff) | |
| download | pkgsrc-dff1826012a1738f99fedea97ac1faa239fe2955.tar.gz | |
PR pkg/51970: Ethernet (libpcap) support not compiled in
Make sure that /usr/include and /usr/lib${LIBABISUFFIX} always appear in the
search paths for headers and libraries, respectively.
Fix the broken ethernet support (and etc) on platforms like NetBSD.
Thanks hans for his valuable suggestions.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/simh/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile index ec18c6a52f0..bc7822aceda 100644 --- a/emulators/simh/Makefile +++ b/emulators/simh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2017/02/15 01:27:00 maya Exp $ +# $NetBSD: Makefile,v 1.46 2017/02/23 10:18:06 rin Exp $ DISTNAME= simh-4.0.0 PKGNAME= simh-4.0.0.20161218 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/} GITHUB_PROJECT= simh @@ -33,9 +33,6 @@ CFLAGS+= -fforce-addr CFLAGS.SunOS+= -DBSD_COMP LDFLAGS.SunOS+= -lm -CFLAGS+= -DUSE_NETWORK -LDFLAGS+= -lpcap - INSTALLATION_DIRS= bin share/simh share/doc/simh MAKE_FILE= makefile @@ -43,12 +40,14 @@ INCLUDES= ${PREFIX:Q}/include:\ ${BUILDLINK_PREFIX.SDL_ttf:Q}/include/SDL:\ ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\ ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\ - ${BUILDLINK_PREFIX.png:Q}/include + ${BUILDLINK_PREFIX.png:Q}/include:\ + /usr/include LIBRARIES= ${PREFIX:Q}/lib:\ ${BUILDLINK_PREFIX.SDL_ttf:Q}/lib${LIBABISUFFIX}:\ ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\ ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\ - ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX} + ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\ + /usr/lib${LIBABISUFFIX} MAKE_ENV+= INCLUDES=${INCLUDES:Q} MAKE_ENV+= LIBRARIES=${LIBRARIES:Q} MAKE_ENV+= GCC=${CC:Q} |