diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-09-12 16:41:31 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-09-12 16:41:31 +0000 |
| commit | 504407493a733c578ac80f381cfb32dc285a41de (patch) | |
| tree | d24ede4ac5a157fbcd733a516f74644df6e69e70 /editors/libreoffice/files/patch-configure | |
| parent | - Fix warning when running pkg2ng (diff) | |
- Deprecate USE_OPENSSL. It causes nothing but trouble at the moment.
- Set some environment variables needed by old build system.
- Fix build with GCC and reinstate WITH_GCC knob.
- Tidy up some nits while I am here.
Notes
Notes:
svn path=/head/; revision=304153
Diffstat (limited to 'editors/libreoffice/files/patch-configure')
| -rw-r--r-- | editors/libreoffice/files/patch-configure | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/editors/libreoffice/files/patch-configure b/editors/libreoffice/files/patch-configure index f105b8bb0056..f94ee854f51d 100644 --- a/editors/libreoffice/files/patch-configure +++ b/editors/libreoffice/files/patch-configure @@ -1,5 +1,5 @@ ---- ./configure.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./configure 2012-08-17 14:41:37.000000000 -0400 +--- ./configure.orig 2012-08-08 09:05:10.000000000 -0400 ++++ ./configure 2012-09-10 18:59:08.000000000 -0400 @@ -25612,11 +25612,13 @@ { $as_echo "$as_me:$LINENO: checking which hash container mdds shall use" >&5 $as_echo_n "checking which hash container mdds shall use... " >&6; } @@ -16,3 +16,14 @@ { $as_echo "$as_me:$LINENO: result: boost::unordered_map" >&5 $as_echo "boost::unordered_map" >&6; } fi +@@ -30882,8 +30884,8 @@ + $as_echo "external" >&6; } + # Mac OS builds should get out without extra stuff is the Mac porters' + # wish. And pkg-config is although Xcode ships a .pc for openssl +- if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ +- "$_os" = "DragonFly"; then ++ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \ ++ "$_os" = "OpenBSD" -o "$_os" = "DragonFly"; then + OPENSSL_CFLAGS= + OPENSSL_LIBS="-lssl -lcrypto" + else |