Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/postgis-Makefile.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1938 35dd7cd027a9
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1938
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     1
 
--- postgis-1.3.6.orig/lwgeom/Makefile	2008-04-24 03:04:52.000000000 +0200
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     2
 
+++ postgis-1.3.6/lwgeom/Makefile	2009-06-26 11:47:48.108705000 +0200
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     3
 
@@ -6,7 +6,7 @@
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     4
 
 # Default missing CXX variable to c++
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     5
 
 #
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     6
 
 ifndef $(CXX)
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     7
 
-	CXX = c++
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     8
 
+	CXX = CC
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
     9
 
 endif
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    10
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    11
 
 #---------------------------------------------------------------
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    12
 
@@ -28,13 +28,14 @@
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    13
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    14
 
 #---------------------------------------------------------------
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    15
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    16
 
-CSTAR_FLAGS = -Wall -g -O2 -fPIC -fexceptions
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    17
 
+CSTAR_FLAGS = -g -O2 -KPIC -library=stlport4
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    18
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    19
 
 override CFLAGS += -DUSE_VERSION=$(USE_VERSION)
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    20
 
 override CFLAGS += -DPOSTGIS_LIB_VERSION='"$(POSTGIS_LIB_VERSION)"'
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    21
 
 override CFLAGS += -DPOSTGIS_VERSION='"$(POSTGIS_VERSION)"'
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    22
 
 override CFLAGS += -DPOSTGIS_SCRIPTS_VERSION='"$(SCRIPTS_VERSION)"'
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    23
 
 override CFLAGS += -DPOSTGIS_BUILD_DATE='"$(POSTGIS_BUILD_DATE)"'
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    24
 
+override CFLAGS += -DHAVE_ISINF=1
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    25
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    26
 
 JTS_OBJ=lwgeom_nojts.o
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    27
 
 ifeq ($(USE_GEOS),1)
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    28
 
@@ -166,7 +167,7 @@
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    29
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    30
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    31
 
 test: liblwgeom_sa.so liblwgeom_sa.a test.c
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    32
 
-	$(CC) -Wall -lm -g -o test test.c liblwgeom_sa.a
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    33
 
+	$(CC) -lm -g -o test test.c liblwgeom_sa.a
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    34
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    35
 
 tsort:
35dd7cd027a9 SFEpostgis creation
dauphing
parents:
diff changeset 
    36
 
 	lorder $(SA_OBJS) | tsort
upstream/spec-files-extra