Skip to content

slapos
slapos
Commit 0e86cb0e authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

More debian12 support 

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

See merge request !1482
parents 2212cded 9afb765d
Pipeline #31316 failed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 30 additions and 12 deletions
    component/ffmpeg/buildout.cfg
    View file @ 0e86cb0e
    ......@@ -3,6 +3,7 @@ extends =
    ../bzip2/buildout.cfg
    ../libpng/buildout.cfg
    ../patch/buildout.cfg
    ../ncurses/buildout.cfg
    ../pkgconfig/buildout.cfg
    ../zlib/buildout.cfg
    ../xorg/buildout.cfg
    ......@@ -86,6 +87,10 @@ md5sum = 8e9866ad6b570c6c95c8cba48060473f
    configure-options =
    --disable-static
    --disable-gtktest
    environment =
    PKG_CONFIG=${pkgconfig:location}/bin/pkgconfig
    PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
    LDFLAGS=-Wl,-rpath=${ncurses:location}/lib
    [opencore-amr]
    recipe = slapos.recipe.cmmi
    ......
    component/proftpd/buildout.cfg
    View file @ 0e86cb0e
    ......@@ -7,6 +7,7 @@ extends =
    ../zlib/buildout.cfg
    ../curl/buildout.cfg
    ../libtool/buildout.cfg
    ../ncurses/buildout.cfg
    ../git/buildout.cfg
    ../patch/buildout.cfg
    ../zstd/buildout.cfg
    ......@@ -32,8 +33,8 @@ configure-options =
    --with-modules=mod_sftp:mod_ban:mod_rewrite
    environment =
    CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\"
    CPPFLAGS=-I${zlib: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
    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 -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
    install_user=${proftpd-info:USER}
    install_group=${proftpd-info:GROUP}
    patch-binary = ${patch:location}/bin/patch
    ......
    component/r-language/buildout.cfg
    View file @ 0e86cb0e
    ......@@ -10,6 +10,14 @@ extends =
    parts =
    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]
    recipe = slapos.recipe.cmmi
    url = https://cran.r-project.org/src/base/R-3/R-3.2.1.tar.gz
    ......@@ -31,5 +39,5 @@ configure-options =
    --without-ICU
    --without-x
    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
    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
    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 -L${libtirpc:location}/lib -Wl,-rpath=${libtirpc:location}/lib
    component/trafficserver/buildout.cfg
    View file @ 0e86cb0e
    ......@@ -48,7 +48,8 @@ patches =
    ${:_profile_base_location_}/trafficserver-9.1.1-via-string-rapid-cdn.patch#8c39243d7525222385d5964485734f99
    environment =
    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 =
    check
    ......
    component/util-linux/buildout.cfg
    View file @ 0e86cb0e
    [buildout]
    extends =
    ../perl/buildout.cfg
    ../ncurses/buildout.cfg
    ../libcap-ng/buildout.cfg
    ../pkgconfig/buildout.cfg
    ../xz-utils/buildout.cfg
    [util-linux]
    ......@@ -41,15 +43,15 @@ configure-options =
    --disable-wall
    --without-libiconv-prefix
    --without-libintl-prefix
    --without-ncurses
    --without-slang
    --without-selinux
    --without-audit
    --with-cap-ng=${libcap-ng:location}
    environment =
    PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
    LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
    CFLAGS=-I${libcap-ng:location}/include
    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 -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
    CFLAGS=-I${libcap-ng:location}/include -I${ncurses:location}/include
    PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
    [libuuid]
    # libuuid is inside util-linux source code with only libuuid feature enabled.
    ......@@ -60,7 +62,6 @@ configure-options =
    --enable-libuuid
    --without-libiconv-prefix
    --without-libintl-prefix
    --without-ncurses
    --without-slang
    --without-pam
    --without-selinux
    ......@@ -68,3 +69,5 @@ configure-options =
    environment =
    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
    software/gitlab/software.cfg
    View file @ 0e86cb0e
    ......@@ -135,7 +135,7 @@ git-executable = ${git:location}/bin/git
    <= git-repository
    repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
    # 9.5.10 + NXD patches:
    revision = v9.5.10-12-g74c9f9fe7f9
    revision = v9.5.10-13-g2b98fc27fd2
    location = ${buildout:parts-directory}/gitlab
    [gitlab-shell-repository]
    ......@@ -187,7 +187,7 @@ configure-command = cd ${:path} &&
    make-binary =
    make-targets= cd ${:path} &&
    ${:bundle} install --deployment --without development test mysql aws kerberos
    ${:bundle} install --deployment --without development test mysql aws kerberos ed25519
    environment =
    PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7