diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-12-04 01:56:43 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-12-04 16:58:49 +0300 |
| commit | 8701797386b5b05d85edb553c798d19de1287bdf (patch) | |
| tree | 654e7063cb1d9cedde2771a252312fd673852274 /packages/gphoto2/files | |
| parent | c79020ca43e3d3d433a73523386131b0c2d981ba (diff) | |
gphoto2: correct popt selection madness
test for gphoto failed on my system, as is ended always trying to link
popt from /usr/lib64.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Diffstat (limited to 'packages/gphoto2/files')
| -rw-r--r-- | packages/gphoto2/files/gphoto-popt-fixup.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/packages/gphoto2/files/gphoto-popt-fixup.patch b/packages/gphoto2/files/gphoto-popt-fixup.patch new file mode 100644 index 0000000000..66b6168e02 --- /dev/null +++ b/packages/gphoto2/files/gphoto-popt-fixup.patch @@ -0,0 +1,22 @@ +Index: gphoto2-2.4.2/m4m/gp-check-popt.m4 +=================================================================== +--- gphoto2-2.4.2.orig/m4m/gp-check-popt.m4 2008-12-04 01:46:40.000000000 +0300 ++++ gphoto2-2.4.2/m4m/gp-check-popt.m4 2008-12-04 01:47:03.000000000 +0300 +@@ -69,7 +69,7 @@ + if test -n "${popt_prefix}"; then + : + elif test -d "${popt_prefix}/include"; then +- CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS}" ++ CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS_save}" + else + continue + fi +@@ -113,7 +113,7 @@ + if test "${popt_libdir}" = "/"; then + popt_libdir="" + elif test -d "${popt_libdir}"; then +- LDFLAGS="-L${popt_libdir} ${LDFLAGS}" ++ LDFLAGS="-L${popt_libdir} ${LDFLAGS_save}" + else + continue + fi |