Skip to content

Commit

Permalink
Fix Qt4 atomics on aarch64. Add a patch from Fedora (similar changes in
Browse files Browse the repository at this point in the history
Arch and Debian) that implements the atomics; removes the use of generic
atomics on aarch64. This allows textproc/qt4-dbus to build.

PR:		223988
Reported by:	linimon
Approved by:	tcberner (mentor)
Obtained from:	Fedora (url is in patch)
Differential Revision:	https://reviews.freebsd.org/D13935
  • Loading branch information
adridg authored and adridg committed Jan 19, 2018
1 parent b121124 commit 52ee35a
Show file tree
Hide file tree
Showing 4 changed files with 480 additions and 1 deletion.
1 change: 1 addition & 0 deletions Mk/bsd.qt.mk
Expand Up @@ -178,6 +178,7 @@ _EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-cor
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test
# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6
_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-aarch64
. else
_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
Expand Down
2 changes: 1 addition & 1 deletion devel/qt4-corelib/Makefile
Expand Up @@ -3,7 +3,7 @@

PORTNAME= corelib
DISTVERSION= ${QT4_VERSION}
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= devel
PKGNAMEPREFIX= qt4-

Expand Down
2 changes: 2 additions & 0 deletions devel/qt4-corelib/pkg-plist
Expand Up @@ -8,6 +8,7 @@
%%QT_INCDIR%%/Qt/qalgorithms.h
%%QT_INCDIR%%/Qt/qanimationgroup.h
%%QT_INCDIR%%/Qt/qatomic.h
%%QT_INCDIR%%/Qt/qatomic_aarch64.h
%%QT_INCDIR%%/Qt/qatomic_alpha.h
%%QT_INCDIR%%/Qt/qatomic_arch.h
%%QT_INCDIR%%/Qt/qatomic_arm.h
Expand Down Expand Up @@ -457,6 +458,7 @@
%%QT_INCDIR%%/QtCore/qalgorithms.h
%%QT_INCDIR%%/QtCore/qanimationgroup.h
%%QT_INCDIR%%/QtCore/qatomic.h
%%QT_INCDIR%%/QtCore/qatomic_aarch64.h
%%QT_INCDIR%%/QtCore/qatomic_alpha.h
%%QT_INCDIR%%/QtCore/qatomic_arch.h
%%QT_INCDIR%%/QtCore/qatomic_arm.h
Expand Down

0 comments on commit 52ee35a

Please sign in to comment.