1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-01 10:59:55 +00:00

- Respect CFLAGS, fix WITHOUT_RUNTIME_CPUDETECTION knob, style

PR:		ports/68431
Submitted by:	Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Approved by:	maintainer
This commit is contained in:
Pav Lucistnik 2004-07-01 08:27:47 +00:00
parent 7ce5950bb9
commit 001fdf62d5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=112652
2 changed files with 23 additions and 6 deletions

View File

@ -642,11 +642,9 @@ post-patch:
@${REINPLACE_CMD} -e \
's|libxmms.so.1|libxmms.so|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
${WRKSRC}/configure
${WRKSRC}/${CONFIGURE_SCRIPT}
.if defined(WITH_RTC)
@${REINPLACE_CMD} -e \
's|<linux/rtc.h>|<rtc.h>|' \

View File

@ -1,5 +1,5 @@
--- configure.orig Mon Apr 26 11:44:06 2004
+++ configure Wed Apr 28 16:09:47 2004
--- configure.orig Mon Apr 26 05:44:06 2004
+++ configure Sun Jun 27 03:30:21 2004
@@ -339,7 +339,7 @@
@ -123,7 +123,26 @@
int main(void) { return RTC_IRQP_READ; }
EOF
_rtc=no
@@ -5772,7 +5722,7 @@
@@ -5736,7 +5686,7 @@
_stripbinaries=no
elif test -z "$CFLAGS" ; then
if test "$host_arch" != "mips" ; then
- CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer"
+ CFLAGS="-O"
else
CFLAGS="-O4 $_march $_mcpu -ffast-math -fomit-frame-pointer"
fi
@@ -5746,6 +5696,9 @@
_stripbinaries=no
fi
else
+ if test "$_runtime_cpudetection" = no ; then
+ CFLAGS="$CFLAGS $_march $_mcpu"
+ fi
cat <<EOF
MPlayer compilation will use the CFLAGS set by you, but:
@@ -5772,7 +5725,7 @@
CFLAGS="$CFLAGS -D_REENTRANT"
elif bsd ; then
# FIXME bsd needs this so maybe other OS'es