my DIFFS to build on AMD64/Quadcore Gentoo
John L. Poole
successfully compile. There were hard-coded paths that had to be
changed, a corrections of lowercase "l" to uppercase "I", and setting
flags for the 64 bit compiler.
diff --git a/bin/rebuild_metaphones b/bin/rebuild_metaphones
old mode 100644
new mode 100755
index c565f0e..cf9ae11
--- a/bin/rebuild_metaphones
+++ b/bin/rebuild_metaphones
@@ -4,7 +4,8 @@ require 'rubygems'
require 'sqlite3'
require 'text'
- @db = SQLite3::Database.new("/Users/katechapman/Desktop/
geonames.db")
+ # @db = SQLite3::Database.new("/Users/katechapman/Desktop/
geonames.db")
+ @db = SQLite3::Database.new("/var/work/tiger/geocoder.db")
@db.create_function("metaphone", 2) do |func, string, len|
test = string.to_s.gsub(/\W/o, "")
if test =~ /^(\d+)/o
diff --git a/src/libsqlite3_geocoder/Makefile b/src/
libsqlite3_geocoder/Makefile
index 1f3a1d7..ba45099 100644
--- a/src/libsqlite3_geocoder/Makefile
+++ b/src/libsqlite3_geocoder/Makefile
@@ -1,14 +1,24 @@
all: libsqlite3_geocoder.so
-CC=gcc-4.2
+# remmed by jlpoole 3/21
+#CC=gcc-4.2
+CC=gcc
+CFLAGS = -fPIC
+#
+#libsqlite3_geocoder.so: extension.o wkb_compress.o util.o metaphon.o
+# $(CC) -arch i386 -lsqlite3 -I/usr/include -shared $^ -o $@
+
libsqlite3_geocoder.so: extension.o wkb_compress.o util.o metaphon.o
- $(CC) -arch i386 -lsqlite3 -I/usr/include -shared $^ -o $@
+ $(CC) -fPIC -lsqlite3 -I/usr/include -shared $^ -o $@
test: wkb_compress.c
$(CC) -DTEST -o wkb_compress $^
clean:
rm -f *.o *.so wkb_compress
+#libsqlite3_geocoder.so: extension.o wkb_compress.o util.o metaphon.o
levenshtein.o
+# $(CC) -arch i386 -lsqlite3 -I/usr/include -shared $^ -o $@
+
libsqlite3_geocoder.so: extension.o wkb_compress.o util.o metaphon.o
levenshtein.o
- $(CC) -arch i386 -lsqlite3 -I/usr/include -shared $^ -o $@
+ $(CC) -fPIC -lsqlite3 -I/usr/include -shared $^ -o $@
test: test_wkb_compress test_levenshtein
diff --git a/src/metaphone/Makefile b/src/metaphone/Makefile
index e5a0f65..dd6aa7b 100644
--- a/src/metaphone/Makefile
+++ b/src/metaphone/Makefile
@@ -1,5 +1,8 @@
all: metaphone.so
+# CFLAGS = -fPIC added by jlpoole per
+# http://groups.google.com/group/geocommons-geocode/browse_thread/thread/ebc4c24c3600fade?hl=en#
+CFLAGS = -fPIC
metaphone.so: extension.o metaphon.o
$(CC) -shared $^ -o $@
diff --git a/src/shp2sqlite/Makefile b/src/shp2sqlite/Makefile
index f19c205..e21da3d 100644
--- a/src/shp2sqlite/Makefile
+++ b/src/shp2sqlite/Makefile
@@ -10,7 +10,9 @@
# *
#
**********************************************************************
-CC=gcc-4.2
+# remm'd by jlpoole 3/21
+#CC=gcc-4.2
+CC=gcc
CFLAGS=-g -O2 -fPIC -DPIC -Wall -Wmissing-prototypes
# Filenames with extension as determined by the OS
@@ -26,7 +28,9 @@ $(LIBLWGEOM):
make -C ../liblwgeom
$(SHP2SQLITE): shpopen.o dbfopen.o getopt.o shp2sqlite.o $(LIBLWGEOM)
- $(CC) -liconv -I/usr/include $(CFLAGS) $^ $(ICONV_LDFLAGS) -lm
-o $@
+ $(CC) -Iiconv -I/usr/include $(CFLAGS) $^ $(ICONV_LDFLAGS) -lm
-o $@
+#$(SHP2SQLITE): shpopen.o dbfopen.o getopt.o shp2sqlite.o $
(LIBLWGEOM)
+# $(CC) -I/usr/include $(CFLAGS) $^ $(ICONV_LDFLAGS) -lm -o $@
install: all
diff --git a/tests/database.rb b/tests/database.rb
index 2a26498..24d90a8 100644
--- a/tests/database.rb
+++ b/tests/database.rb
@@ -7,8 +7,10 @@ require 'fastercsv'
Base = File.dirname(__FILE__)
module Geocoder::US
- Database_File = (
- (ARGV[0] and !ARGV[0].empty?) ? ARGV[0] : "/Users/katechapman/
shineygeocoder.db")
+ # Database_File = (
+ # (ARGV[0] and !ARGV[0].empty?) ? ARGV[0] : "/Users/katechapman/
shineygeocoder.db")
+ Database_File = (
+ (ARGV[0] and !ARGV[0].empty?) ? ARGV[0] : "/var/work/tiger/
geocoder.db")
end
class TestDatabase < Test::Unit::TestCase
@@ -18,7 +20,8 @@ class TestDatabase < Test::Unit::TestCase
end
def get_international_db
- Geocoder::US::Database.new("/Users/katechapman/Desktop/
geonames1.db", {:debug => true})
+ #Geocoder::US::Database.new("/Users/katechapman/Desktop/
geonames1.db", {:debug => true})
+ Geocoder::US::Database.new("/var/work/tiger/geocoder.db", {:debug
=> true})
end
lines 57-112
metaphone.so: extension.o metaphon.o
$(CC) -shared $^ -o $@
diff --git a/src/shp2sqlite/Makefile b/src/shp2sqlite/Makefile
index f19c205..e21da3d 100644
--- a/src/shp2sqlite/Makefile
+++ b/src/shp2sqlite/Makefile
@@ -10,7 +10,9 @@
# *
#
**********************************************************************
-CC=gcc-4.2
+# remm'd by jlpoole 3/21
+#CC=gcc-4.2
+CC=gcc
CFLAGS=-g -O2 -fPIC -DPIC -Wall -Wmissing-prototypes
# Filenames with extension as determined by the OS
@@ -26,7 +28,9 @@ $(LIBLWGEOM):
make -C ../liblwgeom
$(SHP2SQLITE): shpopen.o dbfopen.o getopt.o shp2sqlite.o $(LIBLWGEOM)
- $(CC) -liconv -I/usr/include $(CFLAGS) $^ $(ICONV_LDFLAGS) -lm
-o $@
+ $(CC) -Iiconv -I/usr/include $(CFLAGS) $^ $(ICONV_LDFLAGS) -lm
-o $@
+#$(SHP2SQLITE): shpopen.o dbfopen.o getopt.o shp2sqlite.o $
(LIBLWGEOM)
+# $(CC) -I/usr/include $(CFLAGS) $^ $(ICONV_LDFLAGS) -lm -o $@
install: all
diff --git a/tests/database.rb b/tests/database.rb
index 2a26498..24d90a8 100644
--- a/tests/database.rb
+++ b/tests/database.rb
@@ -7,8 +7,10 @@ require 'fastercsv'
Base = File.dirname(__FILE__)
module Geocoder::US
- Database_File = (
- (ARGV[0] and !ARGV[0].empty?) ? ARGV[0] : "/Users/katechapman/
shineygeocoder.db")
+ # Database_File = (
+ # (ARGV[0] and !ARGV[0].empty?) ? ARGV[0] : "/Users/katechapman/
shineygeocoder.db")
+ Database_File = (
+ (ARGV[0] and !ARGV[0].empty?) ? ARGV[0] : "/var/work/tiger/
geocoder.db")
end
class TestDatabase < Test::Unit::TestCase
@@ -18,7 +20,8 @@ class TestDatabase < Test::Unit::TestCase
end
def get_international_db
- Geocoder::US::Database.new("/Users/katechapman/Desktop/
geonames1.db", {:debug => true})
+ #Geocoder::US::Database.new("/Users/katechapman/Desktop/
geonames1.db", {:debug => true})
+ Geocoder::US::Database.new("/var/work/tiger/geocoder.db", {:debug
=> true})
end
def setup