cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

honor CFLAGS; ok sebastia@

Browse Source
This commit is contained in:
naddy 2011-08-25 12:50:28 +00:00
parent 42cdf99279
commit 7614d75f43
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/snack/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2011/06/08 17:31:33 jasper Exp $
# $OpenBSD: Makefile,v 1.3 2011/08/25 12:50:28 naddy Exp $
COMMENT-main = Tcl/Tk snack sound toolkit
COMMENT-python = Python bindings for Tcl/Tk snack sound toolkit
@ -9,7 +9,7 @@ PKGNAME-main = snack-${MODPY_EGG_VERSION}
PKGNAME-python = py-snack-${MODPY_EGG_VERSION}
CATEGORIES = audio
REVISION-main = 0
REVISION-main = 1
REVISION-python =0
HOMEPAGE = http://www.speech.kth.se/snack

12
audio/snack/patches/patch-unix_Makefile_in
View File

@ -1,19 +1,23 @@
$OpenBSD: patch-unix_Makefile_in,v 1.1.1.1 2011/03/12 08:53:52 sebastia Exp $
$OpenBSD: patch-unix_Makefile_in,v 1.2 2011/08/25 12:50:28 naddy Exp $
don't override CFLAGS
sndio bits
install to OpenBSD tcl layout
--- unix/Makefile.in.orig Wed Dec 14 12:29:39 2005
+++ unix/Makefile.in Mon Jan 17 13:55:43 2011
@@ -29,7 +29,7 @@ TCL_VERSION = @TCLVER@
+++ unix/Makefile.in Wed Aug 24 18:00:55 2011
@@ -29,9 +29,9 @@ TCL_VERSION = @TCLVER@
CC = @CC@
-INCLUDES = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
+INCLUDES = ${XINCLUDES} @TCL_INCLUDE_SPEC@ @TK_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
CFLAGS = -O @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
-CFLAGS = -O @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
+CFLAGS = @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
LIBSO = -lc @ALIB@ @TCL_LIB_SPEC@
@@ -124,6 +124,9 @@ jkAudIO_hp.o: $(UNIX_DIR)/jkAudIO_hp.c
jkAudIO_sun.o: $(UNIX_DIR)/jkAudIO_sun.c

14
audio/snack/patches/patch-unix_configure
View File

@ -1,9 +1,10 @@
$OpenBSD: patch-unix_configure,v 1.1.1.1 2011/03/12 08:53:52 sebastia Exp $
$OpenBSD: patch-unix_configure,v 1.2 2011/08/25 12:50:28 naddy Exp $
mostly sndio bits
don't clobber CFLAGS
--- unix/configure.orig Wed Dec 14 12:29:39 2005
+++ unix/configure Mon Jan 17 13:55:12 2011
+++ unix/configure Wed Aug 24 18:00:33 2011
@@ -308,7 +308,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
@ -13,6 +14,15 @@ mostly sndio bits
ac_subst_files=''
# Initialize some variables set by options.
@@ -1487,7 +1487,7 @@ if test "$TCL_SHARED_BUILD" = 0; then
echo "$as_me: error: Tcl and Tk must be configured with the --enable-shared flag" >&2;}
{ (exit 1); exit 1; }; }
fi
-CFLAGS=$TCL_SHLIB_CFLAGS
+CFLAGS="$CFLAGS $TCL_SHLIB_CFLAGS"
LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
SHLIB_LD=$TCL_SHLIB_LD
SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
@@ -1554,11 +1554,16 @@ case $system in
AFLAG="-DOSS"
AOBJ="jkAudIO_oss.o"