Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gnustep-base, gnustep-gui, gnustep-back: Build on clang64 #21884

Merged
merged 3 commits into from
Sep 15, 2024
Merged

gnustep-base, gnustep-gui, gnustep-back: Build on clang64 #21884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a3ea31
gnustep-base: Build on clang64
qmfrederik Sep 9, 2024
475ce91
gnustep-gui, libpreferencepanes: Add clang64 support
qmfrederik Sep 9, 2024
4e4bf04
gnustep-back: Build for clang64
qmfrederik Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions mingw-w64-gnustep-back/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ _realname=gnustep-back
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.31.0
pkgrel=2
pkgrel=3
pkgdesc="GNUstep GUI Backend (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64')
mingw_arch=('mingw64' 'ucrt64' 'clang64')
url='https://gnustep.github.org/'
license=('spdx:LGPL-2.1-or-later')
makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
Expand All @@ -30,7 +30,15 @@ build() {

. ${MINGW_PREFIX}/share/GNUstep/Makefiles/GNUstep.sh

LDFLAGS="-fuse-ld=lld -lstdc++ -lgcc_s" \
case ${MSYSTEM} in
MINGW*|UCRT*)
export LDFLAGS="-fuse-ld=lld -lstdc++ -lgcc_s"
;;
CLANG*)
export LDFLAGS="-lc++"
;;
esac

CC="$MINGW_PREFIX/bin/clang" \
CXX="$MINGW_PREFIX/bin/clang++" \
./configure \
Expand Down
15 changes: 3 additions & 12 deletions mingw-w64-gnustep-base/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ _realname=gnustep-base
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.30.0
pkgrel=8
pkgrel=9
pkgdesc="GNUstep Base library (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64')
mingw_arch=('mingw64' 'ucrt64' 'clang64')
url='https://gnustep.github.org/'
license=('spdx:LGPL-2.1-or-later')
makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
Expand Down Expand Up @@ -44,20 +44,11 @@ build() {
rsync --recursive --times --links "${srcdir}/${_realname}-${pkgver}"/* "${srcdir}/build-${MSYSTEM}"
cd "${srcdir}/build-${MSYSTEM}"

case ${MSYSTEM} in
MINGW*|UCRT*)
export LDFLAGS="-fuse-ld=lld -lstdc++ -lgcc_s"
;;
CLANG*)
export LDFLAGS="-lc++"
;;
esac

CC="$MINGW_PREFIX/bin/clang" \
CXX="$MINGW_PREFIX/bin/clang++" \
./configure \
--prefix="${MINGW_PREFIX}"

CC="$MINGW_PREFIX/bin/clang" \
CXX="$MINGW_PREFIX/bin/clang++" \
make
Expand Down
4 changes: 2 additions & 2 deletions mingw-w64-gnustep-gui/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ _realname=gnustep-gui
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.31.1
pkgrel=1
pkgrel=2
pkgdesc="GNUstep GUI Library (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64')
mingw_arch=('mingw64' 'ucrt64' 'clang64')
url='https://gnustep.github.io/'
license=('spdx:LGPL-2.1-or-later')
makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
Expand Down
5 changes: 3 additions & 2 deletions mingw-w64-gnustep-make/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _realname=gnustep-make
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.9.2
pkgrel=1
pkgrel=2
pkgdesc="GNUstep build system (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64')
Expand All @@ -25,12 +25,13 @@ build() {
cd "${srcdir}/${_realname}-${pkgver}"
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"

# libobjc2 defers exception handling to the C++ library, so link with a C++ library
case ${MSYSTEM} in
MINGW*|UCRT*)
export LDFLAGS="-fuse-ld=lld -lstdc++ -lgcc_s"
;;
CLANG*)
export LDFLAGS="-lc++"
export LDFLAGS="-Wl,--no-whole-archive -lc++"
;;
esac

Expand Down
4 changes: 2 additions & 2 deletions mingw-w64-libpreferencepanes/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ pkgbase=mingw-w64-${_realname}
# Using same naming convention as Ubuntu: https://packages.ubuntu.com/noble/libpreferencepanes1
pkgname=("${MINGW_PACKAGE_PREFIX}-libpreferencepanes")
pkgver=1.2.1
pkgrel=2
pkgrel=3
pkgdesc="GNUstep preferences library - runtime library (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64')
mingw_arch=('mingw64' 'ucrt64' 'clang64')
url='https://gnustep.github.org/'
license=('spdx:LGPL-2.1-or-later')
makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
Expand Down