From 86da0e9a42b194ebfa3879432746dc6e54a3244a Mon Sep 17 00:00:00 2001 From: Ulrik Date: Mon, 12 Oct 2020 11:33:04 +0200 Subject: [PATCH 1/4] remove ldap, upgrade version --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ce31401..dcc1ebf 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { "name": "postgresql", - "version": "9.6.16", + "version": "13.0.0", "description": "PostgreSQL packaged for Esy", "license": "PostgreSQL Licence", - "source": "https://ftp.postgresql.org/pub/source/v9.6.16/postgresql-9.6.16.tar.gz#911d4efc0c428875c1928f98c72e426d22231e59", + "source": "https://ftp.postgresql.org/pub/source/v13.0/postgresql-13.0.tar.gz#8862cfd6bbf1d0fe94552d702bc581fa4f866873", "override": { "buildEnv": { "CFLAGS": "-I#{esy-openssl.install / 'include'} $CFLAGS", "LDFLAGS": "-L#{esy-openssl.lib} -lcrypto $LDFLAGS" }, "build": [ - "./configure #{os == 'windows' ? '--host x86_64-w64-mingw32': '' } --prefix=$cur__install --with-openssl --without-readline --disable-debug --enable-thread-safety", + "./configure #{os == 'windows' ? '--host x86_64-w64-mingw32': '' } --prefix=$cur__install --with-openssl --without-readline --without-ldap --disable-debug --enable-thread-safety", "make" ], "install": "make install", @@ -47,7 +47,7 @@ }, "dependencies": { "esy-zlib": "esy-packages/esy-zlib", - "esy-openssl": "esy-packages/esy-openssl" + "@reason-native-web/esy-openssl": "^1.1.1000" } } } From d631e33d691c0bc796226d96dc21aff33d4bab91 Mon Sep 17 00:00:00 2001 From: Ulrik Date: Mon, 12 Oct 2020 12:30:58 +0200 Subject: [PATCH 2/4] Correct esy-openssl name --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dcc1ebf..ef8f921 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "source": "https://ftp.postgresql.org/pub/source/v13.0/postgresql-13.0.tar.gz#8862cfd6bbf1d0fe94552d702bc581fa4f866873", "override": { "buildEnv": { - "CFLAGS": "-I#{esy-openssl.install / 'include'} $CFLAGS", - "LDFLAGS": "-L#{esy-openssl.lib} -lcrypto $LDFLAGS" + "CFLAGS": "-I#{@reason-native-web/esy-openssl.install / 'include'} $CFLAGS", + "LDFLAGS": "-L#{@reason-native-web/esy-openssl.lib} -lcrypto $LDFLAGS" }, "build": [ "./configure #{os == 'windows' ? '--host x86_64-w64-mingw32': '' } --prefix=$cur__install --with-openssl --without-readline --without-ldap --disable-debug --enable-thread-safety", From 97dad57832eb00feca47bc66df345d02c55224a8 Mon Sep 17 00:00:00 2001 From: Ulrik Date: Mon, 12 Oct 2020 14:00:59 +0200 Subject: [PATCH 3/4] Don't overwrite LDFLAGS --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef8f921..92e37e8 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "LDFLAGS": { "scope": "global", - "val": "-L#{self.lib} -lpq" + "val": "-L#{self.lib} -lpq $LDFLAGS" }, "CPPFLAGS": { "scope": "global", From 193d72af7f2132e30ad429401232da6359b248a2 Mon Sep 17 00:00:00 2001 From: Ulrik Date: Tue, 13 Oct 2020 20:37:07 +0200 Subject: [PATCH 4/4] Add --libdir --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92e37e8..24ef144 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "LDFLAGS": "-L#{@reason-native-web/esy-openssl.lib} -lcrypto $LDFLAGS" }, "build": [ - "./configure #{os == 'windows' ? '--host x86_64-w64-mingw32': '' } --prefix=$cur__install --with-openssl --without-readline --without-ldap --disable-debug --enable-thread-safety", + "./configure #{os == 'windows' ? '--host x86_64-w64-mingw32': '' } --prefix=$cur__install --with-openssl --without-readline --without-ldap --disable-debug --enable-thread-safety --libdir=#{self.lib}", "make" ], "install": "make install",