]> granicus.if.org Git - graphviz/commitdiff
explicitly enable Lefty compilation in Autotools CI
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sat, 25 Sep 2021 20:57:52 +0000 (13:57 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Wed, 29 Sep 2021 14:48:01 +0000 (07:48 -0700)
Lefty is enabled by default currently, but an upcoming change will toggle this
to default-disabled.

.gitlab-ci.yml
ci/build.sh
debian/rules
redhat/graphviz.spec.fedora.in

index 8316bdc8eef4299395e775ff0405b050080d79b4..10971ea46bb21afe337825bbe601da93645a03ae 100644 (file)
@@ -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:
index 6a9609ea605c2b450c2411325cab65eaba15377c..bff6e07e398d5090257d24be00cc7547ea9535a6 100755 (executable)
@@ -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
index 998861903828ad73c2641299c3c181b20480d1f9..32e3cc0fdb2fe1731ce219785d547c25f7e23fe4 100755 (executable)
@@ -85,6 +85,7 @@ configure-stamp:
        --disable-r \
        --enable-ruby \
        --enable-tcl \
+       --enable-lefty \
        LDFLAGS="-Wl,--as-needed"
        touch configure-stamp
 
index 06f4fff198afdd49a250a169e06c612cc26a68e7..68e01c262b77434d91c71cf2b28710d3e855facc 100644 (file)
@@ -929,6 +929,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
         --with-ghostscript \
         --without-glitz \
         --with-ipsepcola \
+        --enable-lefty \
 %if ! %{ANN}
         --without-ann \
 %endif