X on postgres94

component/postgresql/buildout.cfg

@@ -9,24 +9,36 @@ parts = postgresql
 
 
 [postgresql]
-<= postgresql92
+<= postgresql94
 
 
-[postgresql91]
+[postgresql-common]
 recipe = slapos.recipe.cmmi
-url = http://ftp.postgresql.org/pub/source/v9.1.13/postgresql-9.1.13.tar.bz2
-md5sum = f50e201b4ef7e0581bf32a1a32c9f14c
-configure-options = --with-openssl --with-perl
+#configure-options = --with-openssl --with-perl
+configure-options = --with-openssl
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
 
 
+[postgresql91]
+<= postgresql-common
+url = http://ftp.postgresql.org/pub/source/v9.1.13/postgresql-9.1.13.tar.bz2
+md5sum = f50e201b4ef7e0581bf32a1a32c9f14c
+configure-options += --with-perl
+
+
 [postgresql92]
-recipe = slapos.recipe.cmmi
+<= postgresql-common
 url = http://ftp.postgresql.org/pub/source/v9.2.8/postgresql-9.2.8.tar.bz2
 md5sum = c5c65a9b45ee53ead0b659be21ca1b97
-configure-options = --with-openssl
-environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
+# no --with-perl
+
+[postgresql94]
+<= postgresql-common
+url = http://ftp.postgresql.org/pub/source/v9.4.4/postgresql-9.4.4.tar.bz2
+md5sum = 1fe952c44ed26d7e6a335cf991a9c1c6
+# ld: .../perl/libs-c/libperl.a(op.o): relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a shared object; recompile with -fPIC
+# .../parts/perl/libs-c/libperl.a: could not read symbols: Bad value
+# (because libperla. is not compiled with fPIC)
+# -> no --with-perl

slapos/recipe/postgres/__init__.py

@@ -140,7 +140,8 @@ class Recipe(GenericBaseRecipe):
                     lc_time = 'en_US.UTF-8'
                     default_text_search_config = 'pg_catalog.english'
 
-                    unix_socket_directory = '%s'
+                    # XXX directory vs directories depends on pg version
+                    unix_socket_directories = '%s'
                     unix_socket_permissions = 0700
                     """ % (
                         ','.join(ipv4.union(ipv6)),

software/postgres/instance.cfg.in

@@ -43,7 +43,8 @@ port = 5432
 dbname = db
 # pgdata_directory is created by initdb, and should not exist beforehand.
 pgdata-directory = $${directories:var}/data
-bin = ${postgresql:location}/bin
+# XXX was building postgres twice
+bin = ${postgresql94:location}/bin
 services = $${directories:services}
 
 

software/postgres/software.cfg

@@ -7,7 +7,7 @@ extends =
 parts =
   slapos-cookbook
   instance
-  postgresql92
+  postgresql94
 
 
 #----------------
@@ -17,7 +17,7 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-md5sum = d8b833a2054b82b6031a9420008b58fd
+#md5sum = d8b833a2054b82b6031a9420008b58fd
 mode = 0644
 
 [versions]

stack/slapos.cfg

@@ -16,7 +16,8 @@ python = python2.7
 extensions +=
   buildout-versions
   mr.developer
-  slapos.extension.strip
+# disabled (to save time):
+# slapos.extension.strip
 
 # Use shacache and lxml
 extends =