From d64b75d2704bd3ed47b3f74c0686e19ca74e65fc Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 25 Sep 2021 13:57:52 -0700 Subject: [PATCH] explicitly enable Lefty compilation in Autotools CI Lefty is enabled by default currently, but an upcoming change will toggle this to default-disabled. --- .gitlab-ci.yml | 2 +- ci/build.sh | 4 ++-- debian/rules | 1 + redhat/graphviz.spec.fedora.in | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8316bdc8e..10971ea46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ portable-source: - export CPLUS_INCLUDE_PATH="/usr/include/python3.6m" script: - ./autogen.sh - - ./configure --enable-man-pdfs + - ./configure --enable-lefty --enable-man-pdfs - make dist - make dist-xz artifacts: diff --git a/ci/build.sh b/ci/build.sh index 6a9609ea6..bff6e07e3 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -55,7 +55,7 @@ elif [[ "${CONFIGURE_OPTIONS:-}" =~ "--enable-static" ]]; then GV_VERSION=$( cat GRAPHVIZ_VERSION ) tar xfz graphviz-${GV_VERSION}.tar.gz pushd graphviz-${GV_VERSION} - ./configure $CONFIGURE_OPTIONS --prefix=$( pwd )/build | tee >(../ci/extract-configure-log.sh >../${META_DATA_DIR}/configure.log) + ./configure --enable-lefty $CONFIGURE_OPTIONS --prefix=$( pwd )/build | tee >(../ci/extract-configure-log.sh >../${META_DATA_DIR}/configure.log) make make install popd @@ -78,7 +78,7 @@ else fi elif [[ "${OSTYPE}" =~ "darwin" ]]; then ./autogen.sh - ./configure --prefix=$( pwd )/build --with-quartz=yes + ./configure --enable-lefty --prefix=$( pwd )/build --with-quartz=yes make make install tar cfz graphviz-${GV_VERSION}-${ARCH}.tar.gz --options gzip:compression-level=9 build diff --git a/debian/rules b/debian/rules index 998861903..32e3cc0fd 100755 --- a/debian/rules +++ b/debian/rules @@ -85,6 +85,7 @@ configure-stamp: --disable-r \ --enable-ruby \ --enable-tcl \ + --enable-lefty \ LDFLAGS="-Wl,--as-needed" touch configure-stamp diff --git a/redhat/graphviz.spec.fedora.in b/redhat/graphviz.spec.fedora.in index 06f4fff19..68e01c262 100644 --- a/redhat/graphviz.spec.fedora.in +++ b/redhat/graphviz.spec.fedora.in @@ -929,6 +929,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ --with-ghostscript \ --without-glitz \ --with-ipsepcola \ + --enable-lefty \ %if ! %{ANN} --without-ann \ %endif -- 2.50.0