diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2002-07-01 01:35:29 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2002-07-01 01:35:29 +0800 |
| commit | e95950dec609276fc679697990ce486200137fdd (patch) | |
| tree | 5f99764fea587d5094b361832963cac38e1f48ec | |
| parent | 978ab1d0bf4db05bb523dd2d408579cc7d29836b (diff) | |
| download | freebsd-ports-gnome-e95950dec609276fc679697990ce486200137fdd.tar.gz freebsd-ports-gnome-e95950dec609276fc679697990ce486200137fdd.tar.zst freebsd-ports-gnome-e95950dec609276fc679697990ce486200137fdd.zip | |
Don't use gcc -falign-* options.
These options are not supported by gcc on -stable.
Pointed out by: Bjarne Wichmann Petersen <freebsd.nospam@mekanix.dk>
| -rw-r--r-- | graphics/libxine/Makefile | 13 | ||||
| -rw-r--r-- | graphics/xine/Makefile | 12 | ||||
| -rw-r--r-- | multimedia/libxine/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/xine/Makefile | 12 |
4 files changed, 32 insertions, 18 deletions
diff --git a/graphics/libxine/Makefile b/graphics/libxine/Makefile index aec9a4f184c3..2981c98a3d77 100644 --- a/graphics/libxine/Makefile +++ b/graphics/libxine/Makefile @@ -88,17 +88,20 @@ PLIST_SUB+= HAVE_OGG="@comment " .endif post-patch: - @${REINPLACE_CMD} -i.bak -e \ + @${REINPLACE_CMD} -e \ 's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \ s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \ s|-L/usr/local/lib||g ; \ s|-I/usr/local/include||g ; \ s|-lgiconv|-liconv|g ; \ - s|-malign-loops|-falign-loops|g ; \ - s|-malign-jumps|-falign-jumps|g ; \ - s|-malign-functions|-falign-functions|g ; \ s|-funroll-loops||g' ${WRKSRC}/configure.in - @${REINPLACE_CMD} -i.bak -e \ +.if ${OSVERSION} >= 500035 + @${REINPLACE_CMD} -e \ + 's|-malign-loops|-falign-loops|g ; \ + s|-malign-jumps|-falign-jumps|g ; \ + s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure.in +.endif + @${REINPLACE_CMD} -e \ 's|aclocal,|${ACLOCAL},|g ; \ s|autoconf,|${AUTOCONF},|g ; \ s|automake,|${AUTOMAKE},|g ; \ diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile index e3e53f709966..0162c5716e34 100644 --- a/graphics/xine/Makefile +++ b/graphics/xine/Makefile @@ -23,6 +23,7 @@ LIB_DEPENDS= xine.1:${PORTSDIR}/graphics/libxine \ USE_X_PREFIX= yes USE_IMLIB= yes USE_GMAKE= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ @@ -45,14 +46,17 @@ CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE .endif post-patch: - @${PERL} -pi -e \ + @${REINPLACE_CMD} -e \ 's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \ s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \ - s|-malign-loops|-falign-loops|g ; \ - s|-malign-jumps|-falign-jumps|g ; \ - s|-malign-functions|-falign-functions|g ; \ s|-L/usr/local/lib||g ; \ s|-I/usr/local/include||g' ${WRKSRC}/configure +.if ${OSVERSION} >= 500035 + @${REINPLACE_CMD} -e \ + 's|-malign-loops|-falign-loops|g ; \ + s|-malign-jumps|-falign-jumps|g ; \ + s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure +.endif @${RM} ${WRKSRC}/src/xitk/xine-remote.c post-install: diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index aec9a4f184c3..2981c98a3d77 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -88,17 +88,20 @@ PLIST_SUB+= HAVE_OGG="@comment " .endif post-patch: - @${REINPLACE_CMD} -i.bak -e \ + @${REINPLACE_CMD} -e \ 's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \ s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \ s|-L/usr/local/lib||g ; \ s|-I/usr/local/include||g ; \ s|-lgiconv|-liconv|g ; \ - s|-malign-loops|-falign-loops|g ; \ - s|-malign-jumps|-falign-jumps|g ; \ - s|-malign-functions|-falign-functions|g ; \ s|-funroll-loops||g' ${WRKSRC}/configure.in - @${REINPLACE_CMD} -i.bak -e \ +.if ${OSVERSION} >= 500035 + @${REINPLACE_CMD} -e \ + 's|-malign-loops|-falign-loops|g ; \ + s|-malign-jumps|-falign-jumps|g ; \ + s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure.in +.endif + @${REINPLACE_CMD} -e \ 's|aclocal,|${ACLOCAL},|g ; \ s|autoconf,|${AUTOCONF},|g ; \ s|automake,|${AUTOMAKE},|g ; \ diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index e3e53f709966..0162c5716e34 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -23,6 +23,7 @@ LIB_DEPENDS= xine.1:${PORTSDIR}/graphics/libxine \ USE_X_PREFIX= yes USE_IMLIB= yes USE_GMAKE= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ @@ -45,14 +46,17 @@ CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE .endif post-patch: - @${PERL} -pi -e \ + @${REINPLACE_CMD} -e \ 's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \ s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \ - s|-malign-loops|-falign-loops|g ; \ - s|-malign-jumps|-falign-jumps|g ; \ - s|-malign-functions|-falign-functions|g ; \ s|-L/usr/local/lib||g ; \ s|-I/usr/local/include||g' ${WRKSRC}/configure +.if ${OSVERSION} >= 500035 + @${REINPLACE_CMD} -e \ + 's|-malign-loops|-falign-loops|g ; \ + s|-malign-jumps|-falign-jumps|g ; \ + s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure +.endif @${RM} ${WRKSRC}/src/xitk/xine-remote.c post-install: |