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

- fix a typo in the configure script that would break -Wl,--version-script

Browse Source 
- also fix CFLAGS so it's not inserting -O2 unconditionally

from brad
This commit is contained in:
jasper 2011-08-17 12:38:35 +00:00
parent fa9942f89e
commit cd3e35d1f0
4 changed files with 90 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/tremor/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.16 2011/08/17 12:35:23 jasper Exp $
# $OpenBSD: Makefile,v 1.17 2011/08/17 12:38:35 jasper Exp $
COMMENT= integer-only, fully Ogg Vorbis compliant decoder library
DISTNAME= tremor-20080326
REVISION= 0
SHARED_LIBS += vorbisidec 2.0 # .1.2
CATEGORIES= audio
@ -16,21 +17,24 @@ PERMIT_PACKAGE_FTP= Yes
MASTER_SITES= http://distfiles.bsdfrog.org/
# autogen.sh needs libtoolize
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
AUTOCONF_VERSION=2.61
AUTOMAKE_VERSION=1.9
# autogen.sh needs libtoolize and our libtool doesn't grok
# --version-script
USE_LIBTOOL= gnu
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
WRKDIST= ${WRKDIR}/Tremor
post-extract:
@perl -pi -e 's/\r\n/\n/g' ${WRKSRC}/Version_script.in
pre-configure:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
@cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
.include <bsd.port.mk>

21
audio/tremor/patches/patch-Version_script_in Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-Version_script_in,v 1.1 2011/08/17 12:38:35 jasper Exp $
--- Version_script.in.orig Sat Jul 30 20:16:15 2011
+++ Version_script.in Sat Jul 30 20:21:11 2011
@@ -43,6 +43,17 @@
vorbis_comment_query;
vorbis_comment_query_count;
vorbis_comment_clear;
+ vorbis_block_init;
+ vorbis_block_clear;
+ vorbis_dsp_clear;
+ vorbis_synthesis_headerin;
+ vorbis_synthesis_init;
+ vorbis_synthesis_restart;
+ vorbis_synthesis;
+ vorbis_synthesis_blockin;
+ vorbis_synthesis_pcmout;
+ vorbis_synthesis_read;
+ vorbis_packet_blocksize;
local:
*;

20
audio/tremor/patches/patch-autogen_sh Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-autogen_sh,v 1.1 2011/08/17 12:38:35 jasper Exp $
--- autogen.sh.orig Sat Jul 30 20:24:00 2011
+++ autogen.sh Sat Jul 30 20:24:38 2011
@@ -98,11 +98,6 @@ if test "$DIE" -eq 1; then
exit 1
fi
-if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
-fi
-
echo "Generating configuration files for $package, please wait...."
echo " $ACLOCAL $ACLOCAL_FLAGS"
@@ -117,4 +112,3 @@ echo " autoconf"
autoconf || exit 1
cd $olddir
-$srcdir/configure --enable-maintainer-mode "$@" && echo

39
audio/tremor/patches/patch-configure_in Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-configure_in,v 1.1 2011/08/17 12:38:35 jasper Exp $
--- configure.in.orig Tue Mar 25 22:56:24 2008
+++ configure.in Sat Jul 30 20:33:10 2011
@@ -59,13 +59,13 @@ else
case $host in
arm-*-*)
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -D_ARM_ASSEM_"
- CFLAGS="-O2 -D_ARM_ASSEM_ -fsigned-char"
- PROFILE="-W -pg -g -O2 -D_ARM_ASSEM_ -fsigned-char -fno-inline-functions";;
+ CFLAGS="-D_ARM_ASSEM_ -fsigned-char"
+ PROFILE="-W -pg -g -D_ARM_ASSEM_ -fsigned-char -fno-inline-functions";;
*)
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O2 -Wall -fsigned-char"
- PROFILE="-Wall -pg -g -O2 -fsigned-char -fno-inline-functions";;
+ CFLAGS="-Wall -fsigned-char"
+ PROFILE="-Wall -pg -g -fsigned-char -fno-inline-functions";;
esac
fi
CFLAGS="$CFLAGS $cflags_save -D_REENTRANT"
@@ -76,16 +76,7 @@ LDFLAGS="$LDFLAGS $ldflags_save"
AC_PROG_LD
AC_PROG_LD_GNU
if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
- SHLIB_VERSION_ARG="Wl,--version-script=Version_script"
-
- dnl Set extra linker options
- case "$target_os" in
- linux* | solaris* )
- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
- ;;
- *)
- ;;
- esac
+ SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
LDFLAGS="$LDFLAGS $SHLIB_VERSION_ARG"
fi