Commit fd225231 authored by Rafael Monnerat's avatar Rafael Monnerat

playbook: Fix up flex setup (solve aarch64)

parent 61d78883
Pipeline #3318 skipped
slapos-node (1.3.18+1.0.42+2) unstable; urgency=low
* New version of slapos (1.3.18+1.0.42+2)
-- Rafael Monnerat <rafael@nexedi.com> Fri, 04 Nov 2016 18:04:09 +0100
slapos-node (1.3.18+1.0.42+1) unstable; urgency=low slapos-node (1.3.18+1.0.42+1) unstable; urgency=low
* New version of slapos (1.3.18+1.0.42+1) * New version of slapos (1.3.18+1.0.42+1)
......
...@@ -7,7 +7,7 @@ VERSION=1.3.18 ...@@ -7,7 +7,7 @@ VERSION=1.3.18
# Edit for release # Edit for release
RECIPE_VERSION=1.0.42 RECIPE_VERSION=1.0.42
# Edit for release # Edit for release
RELEASE=1 RELEASE=2
CURRENT_DIRECTORY="$(pwd)" CURRENT_DIRECTORY="$(pwd)"
# Development Section # Development Section
......
...@@ -58,14 +58,12 @@ environment += ...@@ -58,14 +58,12 @@ environment +=
[dbus-python] [dbus-python]
pre-configure = pre-configure =
sed -i 's#!/opt/slapos/parts/python2.7/bin/python2.7#!${python2.7:location}/bin/python2.7#' ${python2.7:location}/bin/python-config
sed -i 's#/opt/slapos/parts/dbus/lib/libdbus-1.la#${dbus:location}/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la sed -i 's#/opt/slapos/parts/dbus/lib/libdbus-1.la#${dbus:location}/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
environment += environment +=
LD_LIBRARY_PATH=${dbus:location}/lib LD_LIBRARY_PATH=${dbus:location}/lib
LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${dbus:location}/lib -Wl,-rpath=${dbus:location}/lib LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${dbus:location}/lib -Wl,-rpath=${dbus:location}/lib
post-install = post-install =
sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
sed -i 's#!${python2.7:location}/bin/python2.7#!/opt/slapos/parts/python2.7/bin/python2.7#' ${python2.7:location}/bin/python-config
[openssl] [openssl]
# HTTPS is not work on debian 6 where the package is originally # HTTPS is not work on debian 6 where the package is originally
...@@ -122,10 +120,8 @@ configure-options = ...@@ -122,10 +120,8 @@ configure-options =
--enable-rpath --enable-rpath
[flex] [flex]
url = http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz environment +=
md5sum = 201d3f38758d95436cbc64903386de0b BISON_PKGDATADIR=${bison:location}/share/bison/
environment =
M4=${m4:location}/bin/m4
[versions] [versions]
cliff = 1.4.5 cliff = 1.4.5
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