diff options
| author | will <will@FreeBSD.org> | 2003-10-03 22:34:44 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2003-10-03 22:34:44 +0000 |
| commit | 8f83b0f304ffe579fd4a068d613cf47bb015e5a8 (patch) | |
| tree | 14d060b659c29b8e11092216ba0d95308a108c5c /x11/kde4 | |
| parent | 2205ebb5c60a6843e652faa33a5623131e615aff (diff) | |
| download | FreeBSD-ports-8f83b0f304ffe579fd4a068d613cf47bb015e5a8.zip FreeBSD-ports-8f83b0f304ffe579fd4a068d613cf47bb015e5a8.tar.gz | |
Fix the -pthread problem in case the option gets removed again. This
patch involved patching the core auto* routines in KDE to accept the
PTHREAD_* variables in the environment, with fallbacks. We decided the
easiest way to implement this in ports was to generate configure instead
of risking incorrect generation at port configure time.
Said patch has already been committed to HEAD in KDE and as such will be
removed with the 3.2 upgrade once it is released.
Ports using Makefile.kde that shouldn't be using them (i.e. non-KDE
modules) have this support commented out due to lack of patch.
Helped out: Adriaan de Groot <adridg@cs.kun.nl>
Lauri Watts <lauri@kde.org>
Andy Fawcett <andy@athame.co.uk>
Diffstat (limited to 'x11/kde4')
| -rw-r--r-- | x11/kde4/Makefile.kde | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde index a974fa4..611f52e 100644 --- a/x11/kde4/Makefile.kde +++ b/x11/kde4/Makefile.kde @@ -37,6 +37,8 @@ post-extract: # Unfortunately, this feature doesn't work right now due to binary files. _NO_KDE_PATCHUP=yes +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" + # Start options here. .if !defined(_NO_KDE_PATCHUP) .if !defined(KDE_PATCHFROM_VER) @@ -90,6 +92,26 @@ CONFIGURE_ARGS+= --with-xinerama .endif .endif # !defined(_NO_KDE_XINERAMA) +.if defined(KDE_I18N) +_NO_KDE_FIXPTHREAD= yes +.endif + +.if !defined(_NO_KDE_FIXPTHREAD) +PTHFIX_DATE?= 2003092201 +MASTER_SITES+= http://www.fruitsalad.org/patches/:kde \ + ${MASTER_SITE_KDE_kde:S,src,FreeBSD/patches,g} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME}-${PTHFIX_DATE}-configure.tar.bz2:kde +PATCH_SITES+= http://www.fruitsalad.org/patches/:kde \ + ${MASTER_SITE_KDE_kde:S,src,FreeBSD/patches,g} +PATCHFILES+= patch-ltmain.sh:kde +USE_REINPLACE= yes + +pre-configure: fix-pedantic +fix-pedantic: + @${REINPLACE_CMD} "s,-pedantic,,g" ${WRKSRC}/configure +.endif + kde-version-check: .if exists(${LOCALBASE}/include/kfm.h) @${ECHO} |
