ports/140731: emulators/hatari does not build if emulators/rtc is installed

[Bojan Petrovic]

The following reply was made to PR ports/140731; it has been noted by GNATS.

From: Bojan Petrovic <bpetrovi at f.bg.ac.rs>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/140731: emulators/hatari does not build if emulators/rtc is installed
Date: Sun, 22 Nov 2009 02:50:34 +0100

 This is a multi-part message in MIME format.
 
 --=_4b0898ea.yD6jlRUKJY4VKKIOto2j2eKKtCQoGbezheR9BkSGBM1yPjob
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Attached bellow is the port patch.
 
 The two created patch files will only change the order of compiler's include
 options.
 
 --=_4b0898ea.yD6jlRUKJY4VKKIOto2j2eKKtCQoGbezheR9BkSGBM1yPjob
 Content-Type: text/plain;
  charset=us-ascii
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="hatari-port-patch.diff"
 
 diff -r 8aaf4cf9ba5d files/patch-Makefile.cnf.in
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ files/patch-Makefile.cnf.in	Sun Nov 22 02:29:54 2009 +0100
 @@ -0,0 +1,22 @@
 +# This patch prevents shadowing of hatari's header
 +# files by files in directories mentioned in X_CFLAGS.
 +--- Makefile.cnf.in	Sun Nov 22 01:43:31 2009 +0100
 ++++ Makefile.cnf.in	Sun Nov 22 01:58:24 2009 +0100
 +@@ -5,7 +5,7 @@
 + CC = @CC@
 + 
 + # Set flags passed to the compiler (e.g. optimization flags)
 +-CFLAGS = @CFLAGS@ @X_CFLAGS@
 ++CFLAGS = @CFLAGS@
 + 
 + # Set flags passed to the preprocessor (e.g. -I<include dir>)
 + CPPFLAGS = @CPPFLAGS@
 +@@ -30,7 +30,7 @@
 + 
 + 
 + # SDL-Library configuration (compiler flags and linker options)
 +-SDL_CFLAGS = @SDL_CFLAGS@
 ++SDL_CFLAGS = @X_CFLAGS@ @SDL_CFLAGS@
 + SDL_LIBS = @SDL_LIBS@
 + 
 + 
 diff -r 8aaf4cf9ba5d files/patch-tools_hmsa_Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ files/patch-tools_hmsa_Makefile	Sun Nov 22 02:29:54 2009 +0100
 @@ -0,0 +1,13 @@
 +# This patch prevents shadowing of hatari's header
 +# files by files in directories mentioned in X_CFLAGS.
 +--- tools/hmsa/Makefile	Sun Nov 22 01:43:31 2009 +0100
 ++++ tools/hmsa/Makefile	Sun Nov 22 01:59:13 2009 +0100
 +@@ -8,7 +8,7 @@
 + OBJS = $(HMSA_OBJS) $(HATARI_OBJS:%.o=../../src/%.o)
 + 
 + # Additional include directories:
 +-CPPFLAGS += $(SDL_CFLAGS) -I../.. -I../../src/includes -I../../src/uae-cpu
 ++CPPFLAGS += -I../.. -I../../src/includes -I../../src/uae-cpu $(SDL_CFLAGS)
 + 
 + all: hmsa
 + 
 
 --=_4b0898ea.yD6jlRUKJY4VKKIOto2j2eKKtCQoGbezheR9BkSGBM1yPjob--