media-libs/leptonica: Use more correct method to disable building static lib.

svn path=/sunrise/; revision=9736

diff --git a/media-libs/leptonica/ChangeLog b/media-libs/leptonica/ChangeLog
index 8b040882cbc2c1dbc8bd2e8531c82ab35e7e3e35..ce7cf8ebc566c8de147e928b69411b42b6531498 100644 (file)
--- a/media-libs/leptonica/ChangeLog
+++ b/media-libs/leptonica/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Dec 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
+  files/leptonica-build-shared.diff:
+  Use more correct method to disable building static lib.
+
   16 Dec 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
   +leptonica-1.62.ebuild, +files/leptonica-build-shared.diff, +metadata.xml:
   New ebuild for bug #297101. Thanks to ohnobinki&Tommy[D] for suggestions.

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 1de58fd1875615a6cde75da380cd4a3a39c13486..100aa5daeecd10e8613ab8c31bef631c6890843a 100644 (file)
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,5 +1,5 @@
-AUX leptonica-build-shared.diff 1127 RMD160 ac045ddbc421f08649f6699ad7c05e9ede77f310 SHA1 752ed66468175da1506868472f74c6be6196aada SHA256 6ef57ff9a879ed892da2ed0e32be50a5b554d793ca91e84ac64cb7040419111a
+AUX leptonica-build-shared.diff 1123 RMD160 e4b621c406d143214d2d0c8cb4ff7fa6173ede25 SHA1 9dc0b648e4c6cea27eb4108652ce12e36360a759 SHA256 e382e206797fb179cf2fecb38a89f40257f2879e27bea614d460a0fc61dc76e7
 DIST leptonlib-1.62.tar.gz 4358997 RMD160 bc80efd084529f467051ca21c2dc1a68911a5110 SHA1 2ec9a73fad65874f7468b1781ae45bbab68cfd69 SHA256 907ed798d60cd85dd0968e65deae9fed2780d3a8a030d3b8811342e9f07a54ef
 EBUILD leptonica-1.62.ebuild 887 RMD160 9590189bae09a04edfab8a0a4a93556845a169d8 SHA1 6478d22ed4b5c1c12c70cd20271ae05ec941755f SHA256 8fc2e6f05c738e491ba6e0aaeb683dc8802752ccb736f1c2759a4814471dc6f6
-MISC ChangeLog 339 RMD160 3dbaad26b4b2db2d4b6ee288f91002d7320f66be SHA1 06cd59371a56046923f6c46800e238aeb7ed6372 SHA256 30b552b5273be8c897a540d5b9af27fe4ce5fdd1a8e5e3ca7c06e4970c1a4ea4
+MISC ChangeLog 499 RMD160 86c68f12154519e5b7177b8f07dab422413b2102 SHA1 58f572b2ae49098f6d18f0bc53a2d215bf10adb8 SHA256 0840f389cb74385d2da6657d87a9156b133994326957f2b5c31ea77f3b8973ac
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/media-libs/leptonica/files/leptonica-build-shared.diff b/media-libs/leptonica/files/leptonica-build-shared.diff
index e418daa81e2a7f73e5a247ab584287d9754a23b2..e326373117a5f35ff3c3f9366be7b42650bb4353 100644 (file)
--- a/media-libs/leptonica/files/leptonica-build-shared.diff
+++ b/media-libs/leptonica/files/leptonica-build-shared.diff
@@ -4,12 +4,11 @@ Additionally removes inappropriate declaration of 'CFLAGS'.
 diff -dupr leptonlib-1.62.orig/src/Makefile.am leptonlib-1.62/src/Makefile.am
 --- leptonlib-1.62.orig/src/Makefile.am        2009-12-16 18:49:59.800517773 +0100
 +++ leptonlib-1.62/src/Makefile.am     2009-12-16 18:50:19.629265044 +0100
-@@ -6,10 +6,10 @@ SUBDIRS =
+@@ -6,10 +6,9 @@ SUBDIRS =
  MAKE = make -f Makefile
  AM_CFLAGS = -D_BSD_SOURCE -DANSI -fPIC
  AM_CPPFLAGS = $(ENDIANNESS)
 -CFLAGS = -O2
-+AM_LDFLAGS = -shared
  
 -lib_LIBRARIES = liblept.a
 -liblept_a_SOURCES = adaptmap.c \
@@ -21,11 +20,12 @@ diff -dupr leptonlib-1.62.orig/src/Makefile.am leptonlib-1.62/src/Makefile.am
 diff -dupr leptonlib-1.62.orig/configure.ac leptonlib-1.62/configure.ac
 --- leptonlib-1.62.orig/configure.ac   2009-12-16 18:54:31.012265321 +0100
 +++ leptonlib-1.62/configure.ac        2009-12-16 18:55:06.954265636 +0100
-@@ -114,7 +114,7 @@ AC_C_BIGENDIAN
+@@ -114,7 +114,8 @@ AC_C_BIGENDIAN
  
  # Check where all the following programs are and set
  # variables accordingly:
 -AC_PROG_RANLIB
++AC_DISABLE_STATIC
 +AC_PROG_LIBTOOL
  # AC_PROG_LN_S
  # AC_PATH_PROG(MV, mv)