diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2005-09-01 17:21:27 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2005-09-01 17:21:27 +0000 |
| commit | b328c1a95b6d3e3f0462080dd809b8e71efb36b9 (patch) | |
| tree | c307b72d062707a93a4996e0500361d02986451f /shells/bush | |
| parent | e4b249f53d13ba63b2d7df3e96f2d88b51d6b8fb (diff) | |
| download | ports-b328c1a95b6d3e3f0462080dd809b8e71efb36b9.tar.gz ports-b328c1a95b6d3e3f0462080dd809b8e71efb36b9.zip | |
- Re-add patch-configure (removed by mistake) to fix the build on the cluster;
- handle ADACFLAGS.
Note: update to 1.0.3 is in progress.
Notes
Notes:
svn path=/head/; revision=141723
Diffstat (limited to 'shells/bush')
| -rw-r--r-- | shells/bush/Makefile | 2 | ||||
| -rw-r--r-- | shells/bush/files/patch-configure | 14 | ||||
| -rw-r--r-- | shells/bush/files/patch-src_GNUmakefile.diff | 14 |
3 files changed, 28 insertions, 2 deletions
diff --git a/shells/bush/Makefile b/shells/bush/Makefile index 1f600e3743b2..4a922df164e2 100644 --- a/shells/bush/Makefile +++ b/shells/bush/Makefile @@ -22,9 +22,11 @@ BUILD_DEPENDS= gnatmake:${PORTSDIR}/lang/gnat \ USE_PGSQL= yes HAS_CONFIGURE= yes +ADACFLAGS?= ${CFLAGS:N-fno-strict-aliasing} USE_GMAKE= yes MAKE_ARGS= GMAKE=${GMAKE} CPUTYPE=${CPUTYPE} PTHREAD_LIBS=${PTHREAD_LIBS} \ SDL_CONFIG=${SDL_CONFIG} +MAKE_ENV= ADACFLAGS="${ADACFLAGS}" MAKEFILE= GNUmakefile USE_SDL= sdl image USE_MYSQL= yes diff --git a/shells/bush/files/patch-configure b/shells/bush/files/patch-configure new file mode 100644 index 000000000000..6456cabfe6d3 --- /dev/null +++ b/shells/bush/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig Tue Aug 16 01:45:37 2005 ++++ configure Wed Aug 31 22:12:06 2005 +@@ -321,9 +321,8 @@ + else + echo "no" + echo +- echo "ADAVOX requires /dev/dsp. Create a /dev/dsp symlink to your real audio device" +- echo "(If you don't care about audio support, try ln -s /dev/null /dev/dsp)" +- exit 1 ++ echo "ADAVOX requires /dev/dsp." ++ echo "Note that you should enable /dev/dsp on the machine on which you will install this package." + fi + + echo "ADAVOX library is configured" diff --git a/shells/bush/files/patch-src_GNUmakefile.diff b/shells/bush/files/patch-src_GNUmakefile.diff index 39cc047c09d8..e4bff89d1359 100644 --- a/shells/bush/files/patch-src_GNUmakefile.diff +++ b/shells/bush/files/patch-src_GNUmakefile.diff @@ -1,11 +1,21 @@ --- src/GNUmakefile.orig.orig Wed Aug 17 22:59:07 2005 -+++ src/GNUmakefile.orig Wed Aug 24 23:45:36 2005 -@@ -11,7 +11,7 @@ ++++ src/GNUmakefile.orig Wed Aug 31 22:35:03 2005 +@@ -11,7 +11,8 @@ GNATMAKE=gnatmake SDLLIBS=SDLLIBSTYPE SDLINCL=SDLINCLTYPE -CFLAGS=CFLAGSTYPE +CFLAGS+=CFLAGSTYPE ++ADACFLAGS+=CFLAGSTYPE # For SDL, sdl_config is not always available. # RPM Directories For Building an RPM file +@@ -75,7 +76,7 @@ + @echo + + c_os.o: c_os.c +- $(CC) $(CFLAGS) $(INCLUDE) -Wall -c c_os.c ++ $(CC) $(ADACFLAGS) $(INCLUDE) -Wall -c c_os.c + + #apq-2.1/Makeincl: + # @echo "---------------------------------------------------------------" |