Skip to content

slapos
slapos
Commit 8aa48865 authored by Xavier Thompson's avatar Xavier Thompson
Browse files
Options

Fix LAMP stack compilation on Raspberry Pi 4 

See merge request nexedi/slapos!1343
parents f5c6253d f5481344
Pipeline #26323 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 35 additions and 16 deletions
    component/apache-php/buildout.cfg
    View file @ 8aa48865
    ...@@ -29,7 +29,7 @@ extends = ...@@ -29,7 +29,7 @@ extends =
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    url = https://github.com/phpredis/phpredis/archive/5.0.0.tar.gz url = https://github.com/phpredis/phpredis/archive/5.0.0.tar.gz
    md5sum = 4f11e0567a10c29394aae52a4fa8bb40 md5sum = 4f11e0567a10c29394aae52a4fa8bb40
    configure-command = configure-command =
    phpize && ./configure phpize && ./configure
    environment = environment =
    PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
    ...@@ -38,7 +38,7 @@ environment = ...@@ -38,7 +38,7 @@ environment =
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    url = https://github.com/Imagick/imagick/archive/3.4.4.tar.gz url = https://github.com/Imagick/imagick/archive/3.4.4.tar.gz
    md5sum = ef6cbadd834eb306bd91874a8f5dea03 md5sum = ef6cbadd834eb306bd91874a8f5dea03
    configure-command = configure-command =
    phpize && ./configure phpize && ./configure
    configure-options = configure-options =
    --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
    ...@@ -51,7 +51,7 @@ environment = ...@@ -51,7 +51,7 @@ environment =
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    url = https://github.com/krakjoe/apcu/archive/v5.1.17.tar.gz url = https://github.com/krakjoe/apcu/archive/v5.1.17.tar.gz
    md5sum = f64b6cd5108aea63df2d5cc301c58b2b md5sum = f64b6cd5108aea63df2d5cc301c58b2b
    configure-command = configure-command =
    phpize && ./configure phpize && ./configure
    configure-options = configure-options =
    --with-php-config=${apache-php:location}/bin/php-config --with-php-config=${apache-php:location}/bin/php-config
    ...@@ -74,7 +74,6 @@ configure-options = ...@@ -74,7 +74,6 @@ configure-options =
    --with-mysql=${mariadb:location} --with-mysql=${mariadb:location}
    --with-zlib-dir=${zlib:location} --with-zlib-dir=${zlib:location}
    --with-bz2=${bzip2:location} --with-bz2=${bzip2:location}
    --with-mcrypt=${libmcrypt:location}
    --with-gd --with-gd
    --with-jpeg-dir=${libjpeg:location} --with-jpeg-dir=${libjpeg:location}
    --with-png-dir=${libpng:location} --with-png-dir=${libpng:location}
    ...@@ -113,16 +112,10 @@ environment = ...@@ -113,16 +112,10 @@ environment =
    PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
    PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
    CPPFLAGS=-I${libzip:location}/include CPPFLAGS=-I${libzip:location}/include
    LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib
    TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_} TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
    HOME=${apache:location} HOME=${apache:location}
    [libmcrypt]
    recipe = slapos.recipe.cmmi
    url = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2
    md5sum = c4f491dd411a09e9de3b8702ea6f73eb
    [xml-rpc] [xml-rpc]
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz
    ......
    component/dropbear/buildout.cfg
    View file @ 8aa48865
    ...@@ -9,6 +9,7 @@ extends = ...@@ -9,6 +9,7 @@ extends =
    ../zlib/buildout.cfg ../zlib/buildout.cfg
    ../coreutils/buildout.cfg ../coreutils/buildout.cfg
    ../patch/buildout.cfg ../patch/buildout.cfg
    ../gnu-config/buildout.cfg
    parts = parts =
    dropbear-output dropbear-output
    ...@@ -20,6 +21,8 @@ md5sum = 0284ea239083f04c8b874e08e1aca243 ...@@ -20,6 +21,8 @@ md5sum = 0284ea239083f04c8b874e08e1aca243
    # in order have all patches working. # in order have all patches working.
    url = https://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2 url = https://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
    pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
    configure-options = configure-options =
    --with-zlib=${zlib:location} --with-zlib=${zlib:location}
    CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING" CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"
    ......
    component/groff/buildout.cfg
    View file @ 8aa48865
    ...@@ -4,14 +4,15 @@ parts = ...@@ -4,14 +4,15 @@ parts =
    extends = extends =
    ../perl/buildout.cfg ../perl/buildout.cfg
    ../texinfo/buildout.cfg
    [groff] [groff]
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz url = http://ftp.gnu.org/gnu/groff/groff-1.22.4.tar.gz
    md5sum = 8b8cd29385b97616a0f0d96d0951c5bf md5sum = 08fb04335e2f5e73f23ea4c3adbf0c5f
    configure-options = configure-options =
    --disable-static --disable-static
    --without-x --without-x
    environment = environment =
    PATH=${perl:location}/bin:%(PATH)s PATH=${perl:location}/bin:${texinfo7:location}/bin:%(PATH)s
    component/jasper/buildout.cfg
    View file @ 8aa48865
    [buildout] [buildout]
    extends = extends =
    ../gnu-config/buildout.cfg
    ../libjpeg/buildout.cfg ../libjpeg/buildout.cfg
    ../patch/buildout.cfg ../patch/buildout.cfg
    parts = parts =
    jasper jasper
    ...@@ -13,6 +15,7 @@ md5sum = a342b2b4495b3e1394e161eb5d85d754 ...@@ -13,6 +15,7 @@ md5sum = a342b2b4495b3e1394e161eb5d85d754
    patch-options = -p1 patch-options = -p1
    patches = patches =
    ${:_profile_base_location_}/jasper_1.900.1-debian1-2.4+deb8u3.patch#1cf61d1ebc87d355523d3484169671f7 ${:_profile_base_location_}/jasper_1.900.1-debian1-2.4+deb8u3.patch#1cf61d1ebc87d355523d3484169671f7
    pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess acaux
    configure-options = configure-options =
    --disable-static --disable-static
    --enable-shared --enable-shared
    ......
    component/openldap/buildout.cfg
    View file @ 8aa48865
    ...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
    parts = parts =
    openldap openldap
    extends = extends =
    ../gnu-config/buildout.cfg
    ../groff/buildout.cfg ../groff/buildout.cfg
    ../openssl/buildout.cfg ../openssl/buildout.cfg
    ../cyrus-sasl/buildout.cfg ../cyrus-sasl/buildout.cfg
    ...@@ -11,6 +12,7 @@ recipe = slapos.recipe.cmmi ...@@ -11,6 +12,7 @@ recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.tgz url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.tgz
    md5sum = e508f97bfd778fec7799f286e5c07176 md5sum = e508f97bfd778fec7799f286e5c07176
    pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build
    configure-options = configure-options =
    --disable-static --disable-static
    --disable-slapd --disable-slapd
    ......
    component/readline/buildout.cfg
    View file @ 8aa48865
    [buildout] [buildout]
    extends = extends =
    ../gnu-config/buildout.cfg
    ../ncurses/buildout.cfg ../ncurses/buildout.cfg
    ../patch/buildout.cfg ../patch/buildout.cfg
    ...@@ -28,6 +29,7 @@ patches = ...@@ -28,6 +29,7 @@ patches =
    http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-013#3e2e5f543ed268a68fd1fa839faade1a http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-013#3e2e5f543ed268a68fd1fa839faade1a
    http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-014#a1be30e1c6f1099bb5fcef00a2631fb8 http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-014#a1be30e1c6f1099bb5fcef00a2631fb8
    md5sum = e39331f32ad14009b9ff49cc10c5e751 md5sum = e39331f32ad14009b9ff49cc10c5e751
    pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess support
    configure-options = configure-options =
    --enable-multibyte --enable-multibyte
    --disable-static --disable-static
    ......
    component/sed/buildout.cfg
    View file @ 8aa48865
    ...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
    [sed] [sed]
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz url = ftp://ftp.gnu.org/gnu/sed/sed-4.9.tar.gz
    md5sum = f0fd4d7da574d4707e442285fd2d3b86 md5sum = a50000a406f767bfa35db319704ef7b5
    environment = environment =
    LDFLAGS =-Wl,--as-needed LDFLAGS =-Wl,--as-needed
    component/texinfo/buildout.cfg
    View file @ 8aa48865
    ...@@ -17,3 +17,14 @@ configure-options = ...@@ -17,3 +17,14 @@ configure-options =
    environment = environment =
    CFLAGS=-I${ncurses:location}/include CFLAGS=-I${ncurses:location}/include
    LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
    [texinfo7]
    recipe = slapos.recipe.cmmi
    shared = true
    url = http://ftp.gnu.org/gnu/texinfo/texinfo-7.0.tar.gz
    md5sum = 49fccd9fb0ae12a2b0fa2a23ee2ade4d
    configure-options =
    --disable-static
    environment =
    CFLAGS=-I${ncurses:location}/include
    LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
    component/xorg/buildout.cfg
    View file @ 8aa48865
    ...@@ -6,6 +6,7 @@ extends = ...@@ -6,6 +6,7 @@ extends =
    ../bzip2/buildout.cfg ../bzip2/buildout.cfg
    ../dash/buildout.cfg ../dash/buildout.cfg
    ../freetype/buildout.cfg ../freetype/buildout.cfg
    ../gnu-config/buildout.cfg
    ../gnutls/buildout.cfg ../gnutls/buildout.cfg
    ../icu/buildout.cfg ../icu/buildout.cfg
    ../intltool/buildout.cfg ../intltool/buildout.cfg
    ...@@ -46,6 +47,7 @@ recipe = slapos.recipe.cmmi ...@@ -46,6 +47,7 @@ recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = https://www.x.org/releases/individual/proto/xproto-7.0.31.tar.gz url = https://www.x.org/releases/individual/proto/xproto-7.0.31.tar.gz
    md5sum = 04b925bf9e472c80f9212615cd684f1e md5sum = 04b925bf9e472c80f9212615cd684f1e
    pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
    configure-options = configure-options =
    --disable-specs --disable-specs
    --without-xmlto --without-xmlto
    ...@@ -59,6 +61,7 @@ recipe = slapos.recipe.cmmi ...@@ -59,6 +61,7 @@ recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = https://www.x.org/releases/individual/proto/xextproto-7.3.0.tar.gz url = https://www.x.org/releases/individual/proto/xextproto-7.3.0.tar.gz
    md5sum = 37b700baa8c8ea7964702d948dd13821 md5sum = 37b700baa8c8ea7964702d948dd13821
    pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
    configure-options = configure-options =
    --disable-specs --disable-specs
    --without-xmlto --without-xmlto
    ...@@ -263,6 +266,7 @@ recipe = slapos.recipe.cmmi ...@@ -263,6 +266,7 @@ recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = https://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 url = https://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
    md5sum = a914ccc1de66ddeb4b611c6b0686e274 md5sum = a914ccc1de66ddeb4b611c6b0686e274
    pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
    environment = environment =
    PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig PKG_CONFIG_PATH=${xorg-util-macros:location}/share/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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7