postgresql: improve reproducibility

- Make pg_config not record var-CC, var-CFLAGS, and configure
  which contains build paths

- Split pgxs in which Makefile.global contains build path from
  package postgresql to postgresql-server-dev, it refers ubuntu
Here is we got from Ubuntu 18.04
$ dpkg -c /var/cache/apt/archives/postgresql-server-dev-10_10.8-0ubuntu0.18.04.1_amd64.deb
-rwxr-xr-x root/root     30792 2019-05-07 17:20 ./usr/lib/postgresql/10/bin/pg_config
drwxr-xr-x root/root         0 2019-05-07 17:20 ./usr/lib/postgresql/10/lib/
drwxr-xr-x root/root         0 2019-05-07 17:20 ./usr/lib/postgresql/10/lib/pgxs/
drwxr-xr-x root/root         0 2019-05-07 17:20 ./usr/lib/postgresql/10/lib/pgxs/config/
drwxr-xr-x root/root         0 2019-05-07 17:20 ./usr/lib/postgresql/10/lib/pgxs/src/
-rw-r--r-- root/root     31309 2019-05-07 17:20 ./usr/lib/postgresql/10/lib/pgxs/src/Makefile.global

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia 2019-06-04 15:31:04 +08:00 committed by Khem Raj
parent 5d1e72d9f7
commit 6a160e340d
3 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From 3c13315447fa175da6c9ebe59a039e611cdb5bd1 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 4 Jun 2019 13:45:30 +0800
Subject: [PATCH] Improve reproducibility,
Remove build patch from binaries which pg_config do
not record var-CC, var-CFLAGS, and configure
$ /usr/bin/pg_config --cc
not recorded
$ /usr/bin/pg_config --configure
not recorded
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
src/common/Makefile | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/common/Makefile b/src/common/Makefile
index 1fc2c66..5e6c457 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -27,10 +27,6 @@ include $(top_builddir)/src/Makefile.global
# don't include subdirectory-path-dependent -I and -L switches
STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
-override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
-override CPPFLAGS += -DVAL_CC="\"$(CC)\""
-override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
--
2.7.4

View File

@ -280,7 +280,9 @@ FILES_${PN}-timezone = "${datadir}/${BPN}/timezone \
${datadir}/${BPN}/timezonesets \
"
RDEPENDS_${PN} += "${PN}-timezone"
FILES_${PN}-server-dev = "${includedir}/${BPN}/server"
FILES_${PN}-server-dev = "${includedir}/${BPN}/server \
${libdir}/${BPN}/pgxs \
"
FILES_libecpg = "${libdir}/libecpg*${SOLIBS}"
FILES_libecpg-dev = "${libdir}/libecpg*${SOLIBSDEV} \

View File

@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78"
SRC_URI += "\
file://not-check-libperl.patch \
file://0001-Add-support-for-RISC-V.patch \
file://0001-Improve-reproducibility.patch \
"
SRC_URI[md5sum] = "c2a729b754b8de86a969c86ec25db076"