diff options
| author | joerg <joerg@pkgsrc.org> | 2014-12-10 23:23:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-12-10 23:23:09 +0000 |
| commit | cbfde52e3c90758bbba6b5a8712a752b9cb3911c (patch) | |
| tree | ea5ade3bdfec117d8aa954c9689b3d13c40925d6 /emulators/arcem | |
| parent | d627d5394408ea79d55f06a48742e775a1b8e17b (diff) | |
| download | pkgsrc-cbfde52e3c90758bbba6b5a8712a752b9cb3911c.tar.gz | |
Provide library search path for X11 libs.
Diffstat (limited to 'emulators/arcem')
| -rw-r--r-- | emulators/arcem/distinfo | 4 | ||||
| -rw-r--r-- | emulators/arcem/patches/patch-aa | 34 |
2 files changed, 17 insertions, 21 deletions
diff --git a/emulators/arcem/distinfo b/emulators/arcem/distinfo index 2d40c4ec186..ade0610809a 100644 --- a/emulators/arcem/distinfo +++ b/emulators/arcem/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2013/11/11 16:44:45 joerg Exp $ +$NetBSD: distinfo,v 1.8 2014/12/10 23:23:09 joerg Exp $ SHA1 (HardImage1.gz) = ab3c2ddd5a913a4051d4c21707e7701b27a103f3 RMD160 (HardImage1.gz) = 09176071c9c325b50a3a2074938789f4e6136d44 @@ -9,5 +9,5 @@ Size (arcem-1.50-src.zip) = 1420685 bytes SHA1 (linux.rom.gz) = 5a3ed7b8bf7e560d14ede14232e50a40a96f9147 RMD160 (linux.rom.gz) = 5bf035a3e6f054a61de62fcf880c52c996f503c6 Size (linux.rom.gz) = 341085 bytes -SHA1 (patch-aa) = 2835320a70d04bd435b7d6a159db8019a8bda472 +SHA1 (patch-aa) = 0f63d74e077fc3abd18fa6630f0b86d2aca321a5 SHA1 (patch-hostfs.c) = 56b3649fdd95ff4b6c98fc2666fd6b0d04c811f8 diff --git a/emulators/arcem/patches/patch-aa b/emulators/arcem/patches/patch-aa index f4016a7ddfb..5def9db5538 100644 --- a/emulators/arcem/patches/patch-aa +++ b/emulators/arcem/patches/patch-aa @@ -1,19 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2013/11/11 16:44:45 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2014/12/10 23:23:09 joerg Exp $ --- Makefile.orig 2012-12-12 23:41:33.000000000 +0000 +++ Makefile -@@ -48,7 +48,9 @@ endif - - CC=gcc - LD=gcc --LDFLAGS= -+LDFLAGS= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \ -+ ${COMPILER_RPATH_FLAG}${X11BASE}/lib -+ - - WARN = -Wall -Wno-return-type -Wno-unknown-pragmas -Wshadow \ - -Wpointer-arith -Wcast-align -Wstrict-prototypes \ -@@ -63,13 +65,13 @@ ifeq ($(DEBUG),yes) +@@ -63,7 +63,7 @@ ifeq ($(DEBUG),yes) CFLAGS += -O0 -g else CFLAGS = -O3 -funroll-loops -fexpensive-optimizations -ffast-math \ @@ -22,10 +11,17 @@ $NetBSD: patch-aa,v 1.5 2013/11/11 16:44:45 joerg Exp $ endif endif - CFLAGS += \ - $(CFL) $(WARN) \ -- -I$(SYSTEM) -Iarch -I. -+ -I$(SYSTEM) -Iarch -I. \ - - prefix=/usr/local +@@ -174,11 +174,11 @@ riscpkg: $(TARGET) + endif + ifeq (${SYSTEM},X) +-CFLAGS += -DSYSTEM_X -I/usr/X11R6/include ++CFLAGS += -DSYSTEM_X -I${X11BASE}/include + ifneq ($(shell uname),Darwin) + CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + endif +-LIBS += -L/usr/X11R6/lib -lXext -lX11 ++LIBS += ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11 + OBJS += X/true.o X/pseudo.o + #SOUND_SUPPORT = yes + endif |