diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-04-14 15:39:50 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-04-14 15:39:50 +0000 |
| commit | 68d7cdcd02f25d3e8844708b0a7ca2a5798fef99 (patch) | |
| tree | 1c23c309776ea8cc25b058d8e47a54bb4211d620 | |
| parent | Sync with libxine shared library version bump. (diff) | |
Attempt to nail down strange problems people are reporting usially
around new release. Apparently, those problem steam from the fact
that those users doesn't update their kernels along with userland,
so that CONFIGURE_TARGET supplied by bsd.port.mk doesn't match
OS version detected by configure script, making it believe that
it is in the cross-compile environment. The same problem observed
on bento.
Use USE_REINPLACE while I'm here.
Notes
Notes:
svn path=/head/; revision=78966
| -rw-r--r-- | x11-toolkits/wxgtk-devel/Makefile | 10 | ||||
| -rw-r--r-- | x11-toolkits/wxgtk/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/wxgtk24/Makefile | 9 |
3 files changed, 18 insertions, 10 deletions
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile index d2df73374d60..f026aaf82c27 100644 --- a/x11-toolkits/wxgtk-devel/Makefile +++ b/x11-toolkits/wxgtk-devel/Makefile @@ -26,6 +26,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_MESA= yes USE_GMAKE= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes USE_GNOMENG= yes USE_GNOME= gtk12 @@ -34,7 +35,9 @@ CONFIGURE_ARGS= --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=builtin \ - --with-opengl + --with-opengl \ + --host=${CONFIGURE_TARGET} \ + --build=${CONFIGURE_TARGET} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \ -I${WRKSRC}/include \ -I${LOCALBASE}/include \ @@ -45,8 +48,7 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \ GTK_CONFIG_2_0="no" pre-patch: - @${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \ - s|-l\$$THREADS_LINK|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[$$]THREADS_LINK|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile index 6994db7b2eda..0bcc8dfe1aec 100644 --- a/x11-toolkits/wxgtk/Makefile +++ b/x11-toolkits/wxgtk/Makefile @@ -23,6 +23,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_MESA= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes @@ -31,7 +32,9 @@ CONFIGURE_ARGS= --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys \ - --with-opengl + --with-opengl \ + --host=${CONFIGURE_TARGET} \ + --build=${CONFIGURE_TARGET} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \ -I${WRKSRC}/include \ -I${LOCALBASE}/include \ @@ -40,8 +43,8 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \ -L${X11BASE}/lib -lm" pre-patch: - @${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \ - s|-l\$$THREADS_LINK|${PTHREAD_LIBS}|g' \ + @${REINPLACE_CMD} -e 's|-l[$$]THREADS_LIB|${PTHREAD_LIBS}|g ; \ + s|-l[$$]THREADS_LINK|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure post-install: diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index 6994db7b2eda..0bcc8dfe1aec 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -23,6 +23,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_MESA= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes @@ -31,7 +32,9 @@ CONFIGURE_ARGS= --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys \ - --with-opengl + --with-opengl \ + --host=${CONFIGURE_TARGET} \ + --build=${CONFIGURE_TARGET} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \ -I${WRKSRC}/include \ -I${LOCALBASE}/include \ @@ -40,8 +43,8 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \ -L${X11BASE}/lib -lm" pre-patch: - @${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \ - s|-l\$$THREADS_LINK|${PTHREAD_LIBS}|g' \ + @${REINPLACE_CMD} -e 's|-l[$$]THREADS_LIB|${PTHREAD_LIBS}|g ; \ + s|-l[$$]THREADS_LINK|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure post-install: |