From d9db7d76b44e7d5c9bc48934d8b4e441104d3edc Mon Sep 17 00:00:00 2001
From: N-R-K <79544946+N-R-K@users.noreply.github.com>
Date: Sun, 27 Feb 2022 14:47:06 +0000
Subject: Makefile: cleanup non-posix stuff (#225)

remove some non-posix extensions which slipped through and adjust ci to
new Makefile changes

users can still overwrite the variables explicitly by using
`make VAR=VALUE`

packagers can also add extra libs to LDLIBS, we're internally using
NSXIV_LDLIBS now.
---
 .github/workflows/build.yml | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e675de2..c527de1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install libimlib2 libimlib2-dev xserver-xorg-core xserver-xorg-dev \
                              libxft2 libxft-dev libexif12 libexif-dev \
-                             gcc clang
+                             gcc clang git
         TCC_SHA="027b8fb9b88fe137447fb8bb1b61079be9702472"
         wget "https://github.com/TinyCC/tinycc/archive/${TCC_SHA}.tar.gz" && tar xzf "${TCC_SHA}.tar.gz"
         ( cd "tinycc-$TCC_SHA" && ./configure && make && sudo make install; )
@@ -32,12 +32,9 @@ jobs:
         CFLAGS+=" -Wbad-function-cast -Wdeclaration-after-statement"
         # silence
         CFLAGS+=" -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
-        export CFLAGS
-        export LDFLAGS="$CFLAGS"
-        export OPT_DEP_DEFAULT=1
-        echo "###  GCC BUILD  ###" && make clean && CC=gcc   make -s
-        echo "### CLANG BUILD ###" && make clean && CC=clang make -s
-        echo "###  TCC BUILD  ###" && make clean && CC=tcc   make -s
+        echo "###  GCC BUILD  ###" && make clean && make -s CC=gcc   CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=1
+        echo "### CLANG BUILD ###" && make clean && make -s CC=clang CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=1
+        echo "###  TCC BUILD  ###" && make clean && make -s CC=tcc   CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=1
 
   minimal-build:
     runs-on: ubuntu-latest
@@ -47,7 +44,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install libimlib2 libimlib2-dev xserver-xorg-core xserver-xorg-dev \
-                             gcc clang
+                             gcc clang git
         sudo apt-get remove libxft2 libxft-dev libexif12 libexif-dev
         TCC_SHA="027b8fb9b88fe137447fb8bb1b61079be9702472"
         wget "https://github.com/TinyCC/tinycc/archive/${TCC_SHA}.tar.gz" && tar xzf "${TCC_SHA}.tar.gz"
@@ -63,9 +60,6 @@ jobs:
         CFLAGS+=" -Wbad-function-cast -Wdeclaration-after-statement"
         # silence
         CFLAGS+=" -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
-        export CFLAGS
-        export LDFLAGS="$CFLAGS"
-        export OPT_DEP_DEFAULT=0
-        echo "###  GCC BUILD  ###" && make clean && CC=gcc   make -s
-        echo "### CLANG BUILD ###" && make clean && CC=clang make -s
-        echo "###  TCC BUILD  ###" && make clean && CC=tcc   make -s
+        echo "###  GCC BUILD  ###" && make clean && make -s CC=gcc   CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=0
+        echo "### CLANG BUILD ###" && make clean && make -s CC=clang CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=0
+        echo "###  TCC BUILD  ###" && make clean && make -s CC=tcc   CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=0
-- 
cgit v1.2.3-54-g00ecf