dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd1ebe856f1'
${ noResults }
mxe/src/geos-1-fixes.patch

80 lines
2.1 KiB
Raw Normal View History Unescape

Copyright headers: point to LICENSE.md and shorten The following script was applied: sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE') sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \ $(git grep -l 'part of MXE.*See index.html') before='This file is part of MXE. See index.html for further information.' after='This file is part of MXE. See LICENSE.md for licensing information.' sed "s/$before/$after/" -i $(git grep -l 'part of MXE') Then git grep 'index.html for further information' revealed two other files. One of them was patched manually (patch.mk). Makefile has text "See index.html for further information" unrelated to licensing. See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
8 years ago
This file is part of MXE. See LICENSE.md for licensing information.
geos: Fix geos-config script Signed-off-by: Timothy Gu <timothygu99@gmail.com>
10 years ago
From 7966e3a9768f3db85fd93f8e4334ef6b58f0fb92 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 18 Oct 2014 17:28:27 -0400
Subject: [PATCH 1/2] geos-config: Fix linking to libm and libstdc++ for static
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/tools/geos-config.in b/tools/geos-config.in
index 9b45b5f..f521772 100644
--- a/tools/geos-config.in
+++ b/tools/geos-config.in
@@ -52,10 +52,10 @@ case $1 in
echo -L${libdir} -lgeos
;;
--static-clibs)
- echo -L${libdir} -lgeos_c -lgeos -m
+ echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm
;;
--static-cclibs)
- echo -L${libdir} -lgeos -m
+ echo -L${libdir} -lgeos -lstdc++ -lm
;;
--ldflags)
echo -L${libdir}
--
1.9.1
From 22befe6776025838d876c6f36a789f2ba467fbb6 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 18 Oct 2014 17:29:24 -0400
Subject: [PATCH 2/2] [MXE] geos-config: Always link as static
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/tools/geos-config.in b/tools/geos-config.in
index f521772..4c9a72b 100644
--- a/tools/geos-config.in
+++ b/tools/geos-config.in
@@ -40,21 +40,21 @@ case $1 in
--cflags)
echo -I${prefix}/include
;;
- --libs)
- # TODO: make an alias for --clibs
- # see http://trac.osgeo.org/geos/ticket/497
- echo -L${libdir} -lgeos
- ;;
- --clibs)
- echo -L${libdir} -lgeos_c
- ;;
- --cclibs)
- echo -L${libdir} -lgeos
- ;;
- --static-clibs)
+# --libs)
+# # TODO: make an alias for --clibs
+# # see http://trac.osgeo.org/geos/ticket/497
+# echo -L${libdir} -lgeos
+# ;;
+# --clibs)
+# echo -L${libdir} -lgeos_c
+# ;;
+# --cclibs)
+# echo -L${libdir} -lgeos
+# ;;
+ --clibs|--static-clibs)
echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm
;;
- --static-cclibs)
+ --libs|--cclibs|--static-cclibs)
echo -L${libdir} -lgeos -lstdc++ -lm
;;
--ldflags)
--
1.9.1