diff options
| author | romain <romain@FreeBSD.org> | 2011-07-29 20:08:52 +0800 |
|---|---|---|
| committer | romain <romain@FreeBSD.org> | 2011-07-29 20:08:52 +0800 |
| commit | a9f28772036f19160726a276537ad8655ec96cd8 (patch) | |
| tree | 1836a073f2091b040f154b7f7512ca56c0f2e712 /devel | |
| parent | f58c8fc48fd033a8dce8b8239245a75eb2b0d18a (diff) | |
| download | freebsd-ports-gnome-a9f28772036f19160726a276537ad8655ec96cd8.tar.gz freebsd-ports-gnome-a9f28772036f19160726a276537ad8655ec96cd8.tar.zst freebsd-ports-gnome-a9f28772036f19160726a276537ad8655ec96cd8.zip | |
- Attempt to fix build with clang;
- Fix pkg-plist.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/google-gdata/Makefile | 15 | ||||
| -rw-r--r-- | devel/google-gdata/files/patch-.._zlib-1.2.3_configure | 37 | ||||
| -rw-r--r-- | devel/google-gdata/pkg-plist | 1 |
3 files changed, 51 insertions, 2 deletions
diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile index 3d6496d4919e..c8d1dc4c53a7 100644 --- a/devel/google-gdata/Makefile +++ b/devel/google-gdata/Makefile @@ -25,7 +25,20 @@ USE_GMAKE= yes pre-configure: @${ECHO_CMD} "---> Configuring for zlib-${ZLIB_VERSION}" - @cd ${WRKDIR}/zlib-${ZLIB_VERSION} && ./configure -s + @(cd ${WRKDIR}/zlib-${ZLIB_VERSION} && \ + ${SET_LATE_CONFIGURE_ARGS} \ + if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_LIB="${INSTALL_LIB}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} --shared; then \ + ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ + (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + ${FALSE}; \ + fi) pre-build: @${ECHO_CMD} "---> Building for zlib-${ZLIB_VERSION}" diff --git a/devel/google-gdata/files/patch-.._zlib-1.2.3_configure b/devel/google-gdata/files/patch-.._zlib-1.2.3_configure new file mode 100644 index 000000000000..c4d07632c027 --- /dev/null +++ b/devel/google-gdata/files/patch-.._zlib-1.2.3_configure @@ -0,0 +1,37 @@ + +$FreeBSD$ + +--- ../zlib-1.2.3/configure.orig ++++ ../zlib-1.2.3/configure +@@ -32,7 +32,7 @@ + mandir=${mandir-'${prefix}/share/man'} + shared_ext='.so' + shared=0 +-gcc=0 ++has_cc=0 + old_cc="$CC" + old_cflags="$CFLAGS" + +@@ -63,17 +63,17 @@ + int hello() {return getchar();} + EOF + +-test -z "$CC" && echo Checking for gcc... +-cc=${CC-gcc} ++test -z "$CC" && echo Checking for cc... ++cc=${CC-cc} + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in +- *gcc*) gcc=1;; ++ cc|gcc|clang) has_cc=1;; + esac + +-if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then ++if test "$has_cc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then + CC="$cc" +- SFLAGS=${CFLAGS-"-fPIC -O3"} ++ SFLAGS="$CFLAGS -fPIC -O3" + CFLAGS="$cflags" + case `(uname -s || echo unknown) 2>/dev/null` in + Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; diff --git a/devel/google-gdata/pkg-plist b/devel/google-gdata/pkg-plist index 51b01d1701a0..ecb1ea0dcc85 100644 --- a/devel/google-gdata/pkg-plist +++ b/devel/google-gdata/pkg-plist @@ -42,7 +42,6 @@ libdata/pkgconfig/gdata-sharp-health.pc libdata/pkgconfig/gdata-sharp-photos.pc libdata/pkgconfig/gdata-sharp-spreadsheets.pc libdata/pkgconfig/gdata-sharp-youtube.pc -@dirrm lib/pkgconfig @dirrm lib/mono/gac/Google.GData.YouTube/1.4.0.2__af04a32718ae8833 @dirrm lib/mono/gac/Google.GData.YouTube @dirrm lib/mono/gac/Google.GData.Spreadsheets/1.4.0.2__3f77feb76ff0d9a1 |