- Attempt to fix build with clang;
- Fix pkg-plist.
This commit is contained in:
parent
47088119ec
commit
b3a63e8cb6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=278522
3 changed files with 51 additions and 2 deletions
|
@ -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}"
|
||||
|
|
37
devel/google-gdata/files/patch-.._zlib-1.2.3_configure
Normal file
37
devel/google-gdata/files/patch-.._zlib-1.2.3_configure
Normal file
|
@ -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"};;
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue