Attachment "ci-cppflags-tk-8.7.diff" to
ticket [ac07794b]
added by
chrstphrchvz
2023-11-17 01:58:50.
diff --git .github/workflows/linux-build.yml .github/workflows/linux-build.yml
index 445e0cf698..8ace0bc620 100644
--- .github/workflows/linux-build.yml
+++ .github/workflows/linux-build.yml
@@ -25,7 +25,7 @@ jobs:
- "clang"
cfgopt:
- ""
- - "CFLAGS=-DTK_NO_DEPRECATED=1"
+ - "CPPFLAGS=-DTK_NO_DEPRECATED=1"
- "--disable-shared"
- "--disable-xft"
- "--disable-xss"
diff --git .github/workflows/linux-with-tcl86-build.yml .github/workflows/linux-with-tcl86-build.yml
index bdd77a113e..f6d7be5e54 100644
--- .github/workflows/linux-with-tcl86-build.yml
+++ .github/workflows/linux-with-tcl86-build.yml
@@ -25,7 +25,7 @@ jobs:
- "clang"
cfgopt:
- ""
- - "CFLAGS=-DTK_NO_DEPRECATED=1"
+ - "CPPFLAGS=-DTK_NO_DEPRECATED=1"
- "--disable-shared"
- "--disable-xft"
- "--disable-xss"
diff --git .github/workflows/linux-with-tcl9-build.yml .github/workflows/linux-with-tcl9-build.yml
index ccff18c640..364d0788fc 100644
--- .github/workflows/linux-with-tcl9-build.yml
+++ .github/workflows/linux-with-tcl9-build.yml
@@ -25,7 +25,7 @@ jobs:
- "clang"
cfgopt:
- ""
- - "CFLAGS=-DTK_NO_DEPRECATED=1"
+ - "CPPFLAGS=-DTK_NO_DEPRECATED=1"
- "--disable-shared"
- "--disable-xft"
- "--disable-xss"
diff --git .github/workflows/linux-with-tcl91-build.yml .github/workflows/linux-with-tcl91-build.yml
index 4672b545ac..348a3385a5 100644
--- .github/workflows/linux-with-tcl91-build.yml
+++ .github/workflows/linux-with-tcl91-build.yml
@@ -25,7 +25,7 @@ jobs:
- "clang"
cfgopt:
- ""
- - "CFLAGS=-DTK_NO_DEPRECATED=1"
+ - "CPPFLAGS=-DTK_NO_DEPRECATED=1"
- "--disable-shared"
- "--disable-xft"
- "--disable-xss"
diff --git .travis.yml .travis.yml
index 7268340529..31f948b7fa 100644
--- .travis.yml
+++ .travis.yml
@@ -53,7 +53,7 @@ jobs:
compiler: gcc
env:
- BUILD_DIR=unix
- - CFGOPT="CFLAGS=-DTK_NO_DEPRECATED=1"
+ - CFGOPT="CPPFLAGS=-DTK_NO_DEPRECATED=1"
script: *x11gui
- name: "Linux/GCC/Shared/no-xft"
os: linux
@@ -113,21 +113,21 @@ jobs:
compiler: g++
env:
- BUILD_DIR=unix
- - CFGOPT="CC=g++ CFLAGS=-Dregister=dont+use+register"
+ - CFGOPT="CC=g++ CPPFLAGS=-Dregister=dont+use+register"
- name: "Linux/G++/Shared UTF_MAX=4"
os: linux
dist: focal
compiler: g++
env:
- BUILD_DIR=unix
- - CFGOPT="CC=g++ CFLAGS=-DTCL_UTF_MAX=4"
+ - CFGOPT="CC=g++ CPPFLAGS=-DTCL_UTF_MAX=4"
- name: "Linux/G++/Shared UTF_MAX=6"
os: linux
dist: focal
compiler: g++
env:
- BUILD_DIR=unix
- - CFGOPT="CC=g++ CFLAGS=-DTCL_UTF_MAX=6"
+ - CFGOPT="CC=g++ CPPFLAGS=-DTCL_UTF_MAX=6"
# Newer/Older versions of GCC
- name: "Linux/GCC 10/Shared"
os: linux
@@ -162,7 +162,7 @@ jobs:
compiler: clang
env:
- BUILD_DIR=unix
- - CFGOPT="CFLAGS=-DTK_NO_DEPRECATED=1"
+ - CFGOPT="CPPFLAGS=-DTK_NO_DEPRECATED=1"
- name: "Linux/Clang/Shared/no-xft"
os: linux
dist: focal
@@ -190,38 +190,38 @@ jobs:
osx_image: xcode12
env:
- BUILD_DIR=unix
- - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
+ - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CPPFLAGS=-I/usr/local/opt/tcl-tk/include"
- name: "macOS/Clang++/Xcode 12/Shared"
os: osx
osx_image: xcode12
env:
- BUILD_DIR=unix
- - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib CC=clang++ --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-D__private_extern__=extern"
+ - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib CC=clang++ --enable-aqua CPPFLAGS=-Wp,-I/usr/local/opt/tcl-tk/include,-D__private_extern__=extern"
- name: "macOS/Xcode 12/Static"
os: osx
osx_image: xcode12
env:
- BUILD_DIR=unix
- - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include"
+ - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CPPFLAGS=-I/usr/local/opt/tcl-tk/include"
- name: "macOS/Xcode 12/Debug"
os: osx
osx_image: xcode12
env:
- BUILD_DIR=unix
- - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include"
+ - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CPPFLAGS=-I/usr/local/opt/tcl-tk/include"
# - name: "macOS/Xcode 12/Shared/XQuartz"
# os: osx
# osx_image: xcode12
# env:
# - BUILD_DIR=unix
-# - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
+# - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CPPFLAGS=-I/usr/local/opt/tcl-tk/include"
# Older MacOS versions
- name: "macOS/Xcode 11/Shared"
os: osx
osx_image: xcode11.7
env:
- BUILD_DIR=unix
- - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
+ - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CPPFLAGS=-Wp,-I/usr/local/opt/tcl-tk/include,-mmacosx-version-min=10.14"
- name: "macOS/Xcode 10/Shared"
os: osx
osx_image: xcode10.3
@@ -232,7 +232,7 @@ jobs:
update: true
env:
- BUILD_DIR=unix
- - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
+ - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CPPFLAGS=-Wp,-I/usr/local/opt/tcl-tk/include,-mmacosx-version-min=10.14"
- name: "macOS/Xcode 9/Shared"
os: osx
osx_image: xcode9.4
@@ -243,7 +243,7 @@ jobs:
update: true
env:
- BUILD_DIR=unix
- - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
+ - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CPPFLAGS=-Wp,-I/usr/local/opt/tcl-tk/include,-mmacosx-version-min=10.13"
# Test on Windows with MSVC native
# - name: "Windows/MSVC/Shared"
# os: windows