summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-07-15 23:31:24 +0000
committerChris Larson <clarson@kergoth.com>2004-07-15 23:31:24 +0000
commitb737adc1d5921dde15403646e75d62672a12b24e (patch)
tree80f57b895c5f963b6bb0145061a27a6b8aaf1c1b
parente21e82fe32560d07e677b1832f4d0b473d0fb6d9 (diff)
Fix a typo in curl.pc, and make curl inherit pkgconfig.
BKrev: 40f713ccNIr5wqcSPwVvJBJiUtP7dw
-rw-r--r--curl/curl-7.12.0/pkgconfig.patch47
-rw-r--r--curl/curl_7.12.0.oe2
2 files changed, 48 insertions, 1 deletions
diff --git a/curl/curl-7.12.0/pkgconfig.patch b/curl/curl-7.12.0/pkgconfig.patch
index e69de29bb2..da62b4e44d 100644
--- a/curl/curl-7.12.0/pkgconfig.patch
+++ b/curl/curl-7.12.0/pkgconfig.patch
@@ -0,0 +1,47 @@
+--- tmp/work/curl-7.12.0-r0/curl-7.12.0/configure.ac 2004-05-25 16:43:39.000000000 -0500
++++ curl-7.12.0/configure.ac 2004-07-15 18:13:18.000000000 -0500
+@@ -1389,7 +1389,8 @@
+ packages/EPM/curl.list \
+ packages/EPM/Makefile \
+ packages/vms/Makefile \
+- curl-config
++ curl-config \
++ curl.pc
+ ])
+ AC_OUTPUT
+
+--- tmp/work/curl-7.12.0-r0/curl-7.12.0/Makefile.am 2004-05-17 16:41:02.000000000 -0500
++++ curl-7.12.0/Makefile.am 2004-07-15 18:10:32.000000000 -0500
+@@ -24,10 +24,16 @@
+ AUTOMAKE_OPTIONS = foreign
+
+ EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist \
+- curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES
++ curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES \
++ curl.pc.in
+
+ bin_SCRIPTS = curl-config
+
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = curl.pc
++
++$(pkgconfig_DATA): config.status
++
+ SUBDIRS = lib src
+ DIST_SUBDIRS = $(SUBDIRS) tests include packages docs
+
+--- tmp/work/curl-7.12.0-r0/curl-7.12.0/curl.pc.in 1969-12-31 18:00:00.000000000 -0600
++++ curl-7.12.0/curl.pc.in 2004-07-15 18:09:14.000000000 -0500
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++versionnum=@VERSIONNUM@
++features=@FEATURES@
++
++Name: curl
++Description: a library that groks URLs
++Version: @VERSION@
++Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
++Cflags: -I${includedir}
diff --git a/curl/curl_7.12.0.oe b/curl/curl_7.12.0.oe
index 5d0b6702f0..0ef89dd167 100644
--- a/curl/curl_7.12.0.oe
+++ b/curl/curl_7.12.0.oe
@@ -13,7 +13,7 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://m4.patch;patch=1 \
file://pkgconfig.patch;patch=1"
-inherit autotools
+inherit autotools pkgconfig
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
--without-ssl --with-random=/dev/urandom"