Commit 0e86cb0e authored by Jérome Perrin's avatar Jérome Perrin

More debian12 support

Some fixes for gcc12 and for ldd problems when some dev packages are installed

See merge request !1482
parents 2212cded 9afb765d
...@@ -3,6 +3,7 @@ extends = ...@@ -3,6 +3,7 @@ extends =
../bzip2/buildout.cfg ../bzip2/buildout.cfg
../libpng/buildout.cfg ../libpng/buildout.cfg
../patch/buildout.cfg ../patch/buildout.cfg
../ncurses/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
../xorg/buildout.cfg ../xorg/buildout.cfg
...@@ -86,6 +87,10 @@ md5sum = 8e9866ad6b570c6c95c8cba48060473f ...@@ -86,6 +87,10 @@ md5sum = 8e9866ad6b570c6c95c8cba48060473f
configure-options = configure-options =
--disable-static --disable-static
--disable-gtktest --disable-gtktest
environment =
PKG_CONFIG=${pkgconfig:location}/bin/pkgconfig
PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
LDFLAGS=-Wl,-rpath=${ncurses:location}/lib
[opencore-amr] [opencore-amr]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
......
...@@ -7,6 +7,7 @@ extends = ...@@ -7,6 +7,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
../curl/buildout.cfg ../curl/buildout.cfg
../libtool/buildout.cfg ../libtool/buildout.cfg
../ncurses/buildout.cfg
../git/buildout.cfg ../git/buildout.cfg
../patch/buildout.cfg ../patch/buildout.cfg
../zstd/buildout.cfg ../zstd/buildout.cfg
...@@ -32,8 +33,8 @@ configure-options = ...@@ -32,8 +33,8 @@ configure-options =
--with-modules=mod_sftp:mod_ban:mod_rewrite --with-modules=mod_sftp:mod_ban:mod_rewrite
environment = environment =
CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\" CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\"
CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include CPPFLAGS=-I${zlib:location}/include -I${ncurses:location}/include -I${openssl:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
install_user=${proftpd-info:USER} install_user=${proftpd-info:USER}
install_group=${proftpd-info:GROUP} install_group=${proftpd-info:GROUP}
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
......
...@@ -10,6 +10,14 @@ extends = ...@@ -10,6 +10,14 @@ extends =
parts = parts =
r-language r-language
[libtirpc]
recipe = slapos.recipe.cmmi
shared = true
url = https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.4.tar.bz2
md5sum = 375dbe7ceb2d0300d173fb40321b49b6
configure-options =
--disable-gssapi
[r-language] [r-language]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://cran.r-project.org/src/base/R-3/R-3.2.1.tar.gz url = https://cran.r-project.org/src/base/R-3/R-3.2.1.tar.gz
...@@ -31,5 +39,5 @@ configure-options = ...@@ -31,5 +39,5 @@ configure-options =
--without-ICU --without-ICU
--without-x --without-x
environment = environment =
CPPFLAGS=-I${bzip2:location}/include -I${openblas:location}/include -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include CPPFLAGS=-I${bzip2:location}/include -I${openblas:location}/include -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${libtirpc:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libtirpc:location}/lib -Wl,-rpath=${libtirpc:location}/lib
...@@ -48,7 +48,8 @@ patches = ...@@ -48,7 +48,8 @@ patches =
${:_profile_base_location_}/trafficserver-9.1.1-via-string-rapid-cdn.patch#8c39243d7525222385d5964485734f99 ${:_profile_base_location_}/trafficserver-9.1.1-via-string-rapid-cdn.patch#8c39243d7525222385d5964485734f99
environment = environment =
PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib -lm LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -lm
CURSES_CFLAGS=-I${ncurses:location}/include
make-target = make-target =
check check
......
[buildout] [buildout]
extends = extends =
../perl/buildout.cfg ../perl/buildout.cfg
../ncurses/buildout.cfg
../libcap-ng/buildout.cfg ../libcap-ng/buildout.cfg
../pkgconfig/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
[util-linux] [util-linux]
...@@ -41,15 +43,15 @@ configure-options = ...@@ -41,15 +43,15 @@ configure-options =
--disable-wall --disable-wall
--without-libiconv-prefix --without-libiconv-prefix
--without-libintl-prefix --without-libintl-prefix
--without-ncurses
--without-slang --without-slang
--without-selinux --without-selinux
--without-audit --without-audit
--with-cap-ng=${libcap-ng:location} --with-cap-ng=${libcap-ng:location}
environment = environment =
PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
CFLAGS=-I${libcap-ng:location}/include CFLAGS=-I${libcap-ng:location}/include -I${ncurses:location}/include
PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
[libuuid] [libuuid]
# libuuid is inside util-linux source code with only libuuid feature enabled. # libuuid is inside util-linux source code with only libuuid feature enabled.
...@@ -60,7 +62,6 @@ configure-options = ...@@ -60,7 +62,6 @@ configure-options =
--enable-libuuid --enable-libuuid
--without-libiconv-prefix --without-libiconv-prefix
--without-libintl-prefix --without-libintl-prefix
--without-ncurses
--without-slang --without-slang
--without-pam --without-pam
--without-selinux --without-selinux
...@@ -68,3 +69,5 @@ configure-options = ...@@ -68,3 +69,5 @@ configure-options =
environment = environment =
PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
CFLAGS=-I${ncurses:location}/include
...@@ -135,7 +135,7 @@ git-executable = ${git:location}/bin/git ...@@ -135,7 +135,7 @@ git-executable = ${git:location}/bin/git
<= git-repository <= git-repository
repository = https://lab.nexedi.com/nexedi/gitlab-ce.git repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
# 9.5.10 + NXD patches: # 9.5.10 + NXD patches:
revision = v9.5.10-12-g74c9f9fe7f9 revision = v9.5.10-13-g2b98fc27fd2
location = ${buildout:parts-directory}/gitlab location = ${buildout:parts-directory}/gitlab
[gitlab-shell-repository] [gitlab-shell-repository]
...@@ -187,7 +187,7 @@ configure-command = cd ${:path} && ...@@ -187,7 +187,7 @@ configure-command = cd ${:path} &&
make-binary = make-binary =
make-targets= cd ${:path} && make-targets= cd ${:path} &&
${:bundle} install --deployment --without development test mysql aws kerberos ${:bundle} install --deployment --without development test mysql aws kerberos ed25519
environment = environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment