1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
This file is part of MXE.
See index.html for further information.
This patch has been taken from:
http://developer.berlios.de/patch/?func=detailpatch&patch_id=3443&group_id=9034
diff -ur lensfun-0.2.7.orig/libs/lensfun/lensfun.mak lensfun-0.2.7/libs/lensfun/lensfun.mak
--- lensfun-0.2.7.orig/libs/lensfun/lensfun.mak 2010-06-21 10:16:59.000000000 +0200
+++ lensfun-0.2.7/libs/lensfun/lensfun.mak 2013-03-19 16:40:39.204093479 +0100
@@ -22,4 +22,4 @@
TARGETS.lensfun-pc = lensfun.pc
SRC.lensfun.pc := $(wildcard libs/lensfun/*.pc.in) config.mak
INSTALL.TARGETS += lensfun-pc
-PKGCONFIG.SED.lensfun-pc = -e "s,@CONF_LENSFUN_STATIC@,$(if $(SHAREDLIBS),,-DCONF_LENSFUN_STATIC),g"
+PKGCONFIG.SED.lensfun-pc = -e "s,@NEED_REGEX@,$(if $(NEED_REGEX),-lregex,),g" -e "s,@CONF_LENSFUN_STATIC@,$(if $(SHAREDLIBS),,-DCONF_LENSFUN_STATIC),g"
diff -ur lensfun-0.2.7.orig/libs/lensfun/lensfun.pc.in lensfun-0.2.7/libs/lensfun/lensfun.pc.in
--- lensfun-0.2.7.orig/libs/lensfun/lensfun.pc.in 2010-06-21 10:16:59.000000000 +0200
+++ lensfun-0.2.7/libs/lensfun/lensfun.pc.in 2013-03-19 16:40:39.204093479 +0100
@@ -2,5 +2,5 @@
Description: A photographic lens database and access library
Version: @CONF_VERSION@
Requires: glib-2.0
-Libs: -L@CONF_LIBDIR@ -llensfun
+Libs: -L@CONF_LIBDIR@ -llensfun @NEED_REGEX@
Cflags: -I@CONF_INCLUDEDIR@ @CONF_LENSFUN_STATIC@
diff -ur lensfun-0.2.7.orig/libs/regex/regex.mak lensfun-0.2.7/libs/regex/regex.mak
--- lensfun-0.2.7.orig/libs/regex/regex.mak 2010-03-24 23:47:25.000000000 +0100
+++ lensfun-0.2.7/libs/regex/regex.mak 2013-03-19 16:40:39.204093479 +0100
@@ -7,6 +7,7 @@
SRC.regex$L := $(wildcard libs/regex/*.c)
CFLAGS.regex$L = -DHAVE_SYS_TYPES_H -DTRE_REGEX_T_FIELD=value \
-DTRE_VERSION="0" -Dinline=
+INSTALL.TARGETS += regex
ifeq ($(TOOLKIT),GCC)
CFLAGS.regex$L += -Wno-unused-function
|
