Skip to content
Snippets Groups Projects
Commit 81a2cd7a authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Support MacPorts locations as well. 

Search in both /usr/local (Homebrew) and /opt/local (MacPorts) for
libraries.

Also, have the name of GNU make be an in option in CI so we can use
the Apple-provided make.
parent 13032448
No related branches found
No related tags found
No related merge requests found
Pipeline #6182 passed
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
.gitlab-ci-unix.yml
+ 25
− 23
View file @ 81a2cd7a
...@@ -17,6 +17,8 @@ spec: ...@@ -17,6 +17,8 @@ spec:
default: 'yes' default: 'yes'
has_gtk: has_gtk:
default: 'no' default: 'no'
gnu_make:
default: 'gmake'
--- ---
".$[[ inputs.os ]]": ".$[[ inputs.os ]]":
...@@ -38,7 +40,7 @@ spec: ...@@ -38,7 +40,7 @@ spec:
script: script:
- cd 3rdp/build - cd 3rdp/build
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS libmozjs - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS libmozjs
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "spidermonkey-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "spidermonkey-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -55,7 +57,7 @@ spec: ...@@ -55,7 +57,7 @@ spec:
script: script:
- cd 3rdp/build - cd 3rdp/build
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS cryptlib - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS cryptlib
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "cryptlib-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "cryptlib-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -68,7 +70,7 @@ spec: ...@@ -68,7 +70,7 @@ spec:
script: script:
- cd src/xpdev - cd src/xpdev
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "xpdev-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "xpdev-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -82,7 +84,7 @@ spec: ...@@ -82,7 +84,7 @@ spec:
script: script:
- cd src/encode - cd src/encode
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "encode-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "encode-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -96,7 +98,7 @@ spec: ...@@ -96,7 +98,7 @@ spec:
script: script:
- cd src/hash - cd src/hash
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "hash-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "hash-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -110,7 +112,7 @@ spec: ...@@ -110,7 +112,7 @@ spec:
script: script:
- cd src/conio - cd src/conio
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "ciolib-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "ciolib-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -124,7 +126,7 @@ spec: ...@@ -124,7 +126,7 @@ spec:
script: script:
- cd src/sftp - cd src/sftp
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "sftp-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "sftp-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -138,7 +140,7 @@ spec: ...@@ -138,7 +140,7 @@ spec:
script: script:
- cd src/smblib - cd src/smblib
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "smblib-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "smblib-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -152,7 +154,7 @@ spec: ...@@ -152,7 +154,7 @@ spec:
script: script:
- cd src/uifc - cd src/uifc
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "uifc-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "uifc-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -166,7 +168,7 @@ spec: ...@@ -166,7 +168,7 @@ spec:
script: script:
- cd src/sbbs3 - cd src/sbbs3
- touch depend - touch depend
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS gitinfo - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS gitinfo
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "gitinfo-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "gitinfo-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -188,7 +190,7 @@ spec: ...@@ -188,7 +190,7 @@ spec:
- touch uifc - touch uifc
- touch uifc-mt - touch uifc-mt
- touch cl - touch cl
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "scfg-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "scfg-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -219,7 +221,7 @@ spec: ...@@ -219,7 +221,7 @@ spec:
- touch ciolib-mt - touch ciolib-mt
- touch uifc - touch uifc
- touch uifc-mt - touch uifc-mt
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "uedit-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "uedit-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -253,7 +255,7 @@ spec: ...@@ -253,7 +255,7 @@ spec:
- touch ciolib-mt - touch ciolib-mt
- touch uifc - touch uifc
- touch uifc-mt - touch uifc-mt
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "umonitor-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "umonitor-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -283,7 +285,7 @@ spec: ...@@ -283,7 +285,7 @@ spec:
- touch ciolib-mt - touch ciolib-mt
- touch uifc - touch uifc
- touch uifc-mt - touch uifc-mt
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO standalone-utils - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO standalone-utils
artifacts: artifacts:
expire_in: 30 mins expire_in: 30 mins
name: "utils-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "utils-$[[ inputs.os ]]-$[[ inputs.platform ]]"
...@@ -332,8 +334,8 @@ spec: ...@@ -332,8 +334,8 @@ spec:
- touch umonitor/uifc-mt - touch umonitor/uifc-mt
- touch umonitor/xpdev-mt - touch umonitor/xpdev-mt
- touch umonitor/smblib - touch umonitor/smblib
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO all - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO all
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS jsdoor - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS jsdoor
artifacts: artifacts:
name: "sbbs-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "sbbs-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
...@@ -377,7 +379,7 @@ spec: ...@@ -377,7 +379,7 @@ spec:
- touch uifc-mt - touch uifc-mt
- touch sftp-mt - touch sftp-mt
- touch cl - touch cl
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "syncterm-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "syncterm-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
...@@ -400,7 +402,7 @@ spec: ...@@ -400,7 +402,7 @@ spec:
- touch xpdev - touch xpdev
- touch xpdev-mt - touch xpdev-mt
- touch ciolib-mt - touch ciolib-mt
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "syncdraw-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "syncdraw-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
...@@ -417,7 +419,7 @@ spec: ...@@ -417,7 +419,7 @@ spec:
- touch depend - touch depend
- touch xpdev - touch xpdev
- touch xpdev-mt - touch xpdev-mt
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "sexpots-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "sexpots-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
...@@ -436,7 +438,7 @@ spec: ...@@ -436,7 +438,7 @@ spec:
- touch encode - touch encode
- touch hash - touch hash
- touch smblib - touch smblib
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "gtkchat-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "gtkchat-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
...@@ -462,7 +464,7 @@ spec: ...@@ -462,7 +464,7 @@ spec:
- touch smblib - touch smblib
- touch cl - touch cl
- touch js - touch js
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "gtkmonitor-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "gtkmonitor-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
...@@ -489,7 +491,7 @@ spec: ...@@ -489,7 +491,7 @@ spec:
- touch smblib - touch smblib
- touch cl - touch cl
- touch js - touch js
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "gtkuseredit-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "gtkuseredit-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
...@@ -515,7 +517,7 @@ spec: ...@@ -515,7 +517,7 @@ spec:
- touch xpdev-mt - touch xpdev-mt
- touch smblib - touch smblib
- touch cl - touch cl
- gmake $[[ inputs.build_flags ]] $BUILD_ARGS - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS
artifacts: artifacts:
name: "gtkuserlist-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "gtkuserlist-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
......
.gitlab-ci.yml
+ 1
− 0
View file @ 81a2cd7a
...@@ -63,6 +63,7 @@ include: ...@@ -63,6 +63,7 @@ include:
os: 'darwin' os: 'darwin'
platform: 'x86' platform: 'x86'
tagname: 'macOS' tagname: 'macOS'
gnu_make: 'make'
smoketest-jsexec-linux: smoketest-jsexec-linux:
tags: [Linux] tags: [Linux]
......
3rdp/build/js-darwin-configure.patch
+ 15
− 6
View file @ 81a2cd7a
--- js-1.8.5/js/src/configure.orig 2024-03-16 21:46:17 --- js-1.8.5/js/src/configure.in.orig 2024-03-16 23:06:25
+++ js-1.8.5/js/src/configure 2024-03-16 21:47:48 +++ js-1.8.5/js/src/configure.in 2024-03-16 23:06:47
@@ -953,8 +953,8 @@ @@ -196,8 +196,8 @@
if test -z "$MIDL"; then MIDL=midl; fi if test -z "$MIDL"; then MIDL=midl; fi
;; ;;
*-darwin*) *-darwin*)
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
;; ;;
esac esac
fi fi
--- js-1.8.5/js/src/configure.in.orig 2024-03-16 23:06:25 --- js-1.8.5/js/src/configure.orig 2024-03-20 01:29:39
+++ js-1.8.5/js/src/configure.in 2024-03-16 23:06:47 +++ js-1.8.5/js/src/configure 2024-03-20 01:30:55
@@ -196,8 +196,8 @@ @@ -953,8 +953,8 @@
if test -z "$MIDL"; then MIDL=midl; fi if test -z "$MIDL"; then MIDL=midl; fi
;; ;;
*-darwin*) *-darwin*)
...@@ -24,3 +24,12 @@ ...@@ -24,3 +24,12 @@
;; ;;
esac esac
fi fi
@@ -3873,7 +3873,7 @@
echo "$ac_t""yes" 1>&6
fi
- for ac_prog in $PYTHON python2.7 python2.6 python2.5 python
+ for ac_prog in $PYTHON python2.7 python2.6 python2.5 python python3
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
src/sbbs3/GNUmakefile
+ 2
− 2
View file @ 81a2cd7a
...@@ -109,8 +109,8 @@ ifeq ($(shell pkg-config libarchive --exists && echo "yes"),yes) ...@@ -109,8 +109,8 @@ ifeq ($(shell pkg-config libarchive --exists && echo "yes"),yes)
FILE_LIBS = $(shell pkg-config libarchive --libs) FILE_LIBS = $(shell pkg-config libarchive --libs)
else else
ifeq ($(os), darwin) ifeq ($(os), darwin)
CFLAGS += -I/usr/local/opt/libarchive/include CFLAGS += -I/usr/local/opt/libarchive/include -I/opt/local/include
LDFLAGS += -L/usr/local/opt/libarchive/lib LDFLAGS += -L/usr/local/opt/libarchive/lib -I/opt/local/lib
endif endif
FILE_LIBS = -larchive FILE_LIBS = -larchive
endif endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment