-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add our patches to libspatialite 5.1.0 overlay
- Loading branch information
Showing
3 changed files
with
74 additions
and
0 deletions.
There are no files selected for viewing
43 changes: 43 additions & 0 deletions
43
vcpkg-vendor/vcpkg-overlay-ports/libspatialite/fix-makefile-mod.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
diff --git a/makefile_mod.vc b/makefile_mod.vc | ||
index 4815377..dbdbede 100644 | ||
--- a/makefile_mod.vc | ||
+++ b/makefile_mod.vc | ||
@@ -93,7 +93,7 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \ | ||
MOD_SPATIALITE_DLL = mod_spatialite$(VERSION).dll | ||
|
||
CFLAGS = /nologo -I.\src\headers -I.\src\topology \ | ||
- -I. -IC:\OSGeo4W\include $(OPTFLAGS) | ||
+ -I. $(OPTFLAGS) | ||
|
||
default: all | ||
|
||
@@ -107,12 +107,9 @@ mod_spatialite.lib: $(LIBOBJ) | ||
$(MOD_SPATIALITE_DLL): mod_spatialite_i.lib | ||
|
||
mod_spatialite_i.lib: $(LIBOBJ) | ||
- link /dll /out:$(MOD_SPATIALITE_DLL) \ | ||
+ link $(LINK_FLAGS) /dll /out:$(MOD_SPATIALITE_DLL) \ | ||
/implib:mod_spatialite_i.lib $(LIBOBJ) \ | ||
- C:\OSGeo4W\lib\proj_i.lib C:\OSGeo4W\lib\geos_c.lib \ | ||
- C:\OSGeo4w\lib\freexl_i.lib C:\OSGeo4w\lib\iconv.lib \ | ||
- C:\OSGeo4W\lib\sqlite3_i.lib C:\OSGeo4W\lib\zlib.lib \ | ||
- C:\OSGeo4W\lib\libxml2.lib C:\OSGeo4W\lib\librttopo.lib | ||
+ $(LIBS_ALL) | ||
if exist $(MOD_SPATIALITE_DLL).manifest mt -manifest \ | ||
$(MOD_SPATIALITE_DLL).manifest -outputresource:$(MOD_SPATIALITE_DLL);2 | ||
|
||
diff --git a/nmake_mod.opt b/nmake_mod.opt | ||
index 7772853..df6ec25 100644 | ||
--- a/nmake_mod.opt | ||
+++ b/nmake_mod.opt | ||
@@ -1,8 +1,8 @@ | ||
# Directory tree where SpatiaLite will be installed. | ||
-INSTDIR=C:\OSGeo4W | ||
+INSTDIR=$(INST_DIR) | ||
|
||
# Uncomment the first for an optimized build, or the second for debug. | ||
-OPTFLAGS= /nologo /Ox /fp:precise /W4 /MD /D_CRT_SECURE_NO_WARNINGS \ | ||
+OPTFLAGS= /nologo /fp:precise /W4 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ | ||
/DDLL_EXPORT /DLOADABLE_EXTENSION /DYY_NO_UNISTD_H | ||
#OPTFLAGS= /nologo /Zi /MD /Fdmod_spatialite.pdb /DDLL_EXPORT | ||
|
13 changes: 13 additions & 0 deletions
13
vcpkg-vendor/vcpkg-overlay-ports/libspatialite/ok-load-permanently.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/src/spatialite/spatialite.c b/src/spatialite/spatialite.c | ||
index 9d6063d..f3dda37 100644 | ||
--- a/src/spatialite/spatialite.c | ||
+++ b/src/spatialite/spatialite.c | ||
@@ -53439,7 +53439,7 @@ init_spatialite_extension (sqlite3 * db, char **pzErrMsg, | ||
/* setting a timeout handler */ | ||
sqlite3_busy_timeout (db, 5000); | ||
|
||
- return 0; | ||
+ return SQLITE_OK_LOAD_PERMANENTLY; | ||
} | ||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters