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

[DO NOT MERGE] Repin #88

Closed
wants to merge 139 commits into from
Closed

[DO NOT MERGE] Repin #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
5b2d79e
Add cross-compilation support
mingwandroid Aug 25, 2017
b6b6c02
Generalized pinning
mingwandroid Aug 25, 2017
1593a1e
Generalized pinning
mingwandroid Aug 26, 2017
33bf58b
Generalize logging
mingwandroid Aug 27, 2017
9e30528
cdts are linux-only
mingwandroid Aug 28, 2017
27791d0
Fix missing selector
mingwandroid Aug 31, 2017
6b1e061
Darwin cross WIP
mingwandroid Aug 31, 2017
0198f73
Go back to -system-freetype, add back jpeg dep
mingwandroid Aug 31, 2017
ec37b25
Cannot use system-freetype due to PlatformSupport library not caring
mingwandroid Aug 31, 2017
8deca0f
More patches, clang 4 compat. this time
mingwandroid Aug 31, 2017
7163957
Qt now builds
mingwandroid Sep 1, 2017
50b9c75
Put back the awful .app renaming and qt.conf stuff
mingwandroid Sep 1, 2017
6cc9c82
Argh, missed a #
mingwandroid Sep 1, 2017
fe0ad31
Use our compilers during configure and test
mingwandroid Sep 4, 2017
ac940fc
.. and add to PATH so our compiler gets found during test
mingwandroid Sep 4, 2017
461888a
Remove pkg-config hack (we do it in pkg-config itself), exit if no ru…
mingwandroid Sep 4, 2017
96fb724
Add ruby build dep
mingwandroid Sep 4, 2017
33601bc
Workaround Qt's terrible mishandling of -isystem
mingwandroid Sep 5, 2017
03f6bfa
Simplify recipe for CB 3
nehaljwani Sep 11, 2017
cbccd53
Switch to regex matching
nehaljwani Sep 19, 2017
c89355f
Bump build number for macOS
nehaljwani Sep 19, 2017
5055807
Undo some conda-forge changes
mingwandroid Sep 20, 2017
9e4d67c
Undo conda-forge badness
mingwandroid Sep 20, 2017
8979194
Fix PATH
mingwandroid Sep 20, 2017
f04df7e
Bump build to sync it with released tarball (on macOS)
mingwandroid Oct 13, 2017
47a79de
Add files needed for test
mingwandroid Oct 16, 2017
2065851
Add exact upstream patch for copy paste bug in qtwebkit
mingwandroid Feb 12, 2018
c460bc5
Fix new qtwebkit copy paste patch so it applies
mingwandroid Feb 12, 2018
c88dedc
We need to merge_build_host
mingwandroid Feb 12, 2018
d83d54a
Add -disable-new-dtags configure option and use it
mingwandroid Feb 12, 2018
264d8f1
Add missing requirements/run
mingwandroid Feb 12, 2018
8b2efcb
Ignore g++/gcc symlinks already existing (for --dirty / --keep-old-work)
mingwandroid Feb 12, 2018
83242d2
Remove conda inspect rubbish
mingwandroid Feb 12, 2018
c5b2bf3
Oops, missed a bit
mingwandroid Feb 12, 2018
fcafbde
(WIP) Update to 3.6.3
mingwandroid Oct 16, 2017
0e41d43
Rewrite 0001-qtwebengine-mac_sdk_min-to-10.9.patch
mingwandroid Oct 16, 2017
846170e
(WIP) Update to 5.6.3
mingwandroid Oct 16, 2017
ea549da
Add exact upstream patch for copy paste bug in qtwebkit
mingwandroid Feb 12, 2018
da65768
Remove patches not needed in qt 5.9.4 and add macOS 10.9 support
mingwandroid Feb 14, 2018
412a6d1
More macOS 10.9 support
mingwandroid Feb 19, 2018
eae446e
Undo macOS 10.9 support, 10.10 is the new minimum
mingwandroid Feb 28, 2018
2582ccb
Force use of /opt/MacOSX10.11.sdk and other fixes
mingwandroid Mar 1, 2018
affb3fd
Add missing_dso_whitetlist for macOS
mingwandroid Mar 1, 2018
045a27f
Add back 0013-NSEnumerator-is-a-non-parameterized-class.patch
mingwandroid Mar 1, 2018
092d34a
Fix typo
mingwandroid Mar 1, 2018
d62c38b
Fix the qdevice.pri sed
mingwandroid Mar 1, 2018
0a18a8b
skip when not vc 14 on Windows
mingwandroid Mar 1, 2018
af4a914
drop unneeded jinja2
mingwandroid Mar 1, 2018
6f748bb
A linux fix for old-ish kernel headers
mingwandroid Mar 1, 2018
43bcdf7
Add WebEngine unix deps
mingwandroid Mar 1, 2018
bff053a
Skip using our libs for now, add info re debugging lack of -I$PREFIX/…
mingwandroid Mar 2, 2018
161aa12
Add old 5.6 disable-new-dtags patch back (needs to be reworked)
mingwandroid Mar 2, 2018
96d904c
Some qtwebengine fixes for linux
mingwandroid Mar 3, 2018
5d277df
More linux work
mingwandroid Mar 3, 2018
3ab7c5c
More Linux fixes
mingwandroid Mar 5, 2018
ed7effb
Test for Qt5WebEngine shared lib on all platforms
mingwandroid Mar 5, 2018
206c487
Start Windows 5.9.4 support
mingwandroid Mar 6, 2018
b7d97d7
Add some fallbacks for xcrun and xcodebuild
mingwandroid Mar 6, 2018
71b1cb5
Windows fixes
mingwandroid Mar 6, 2018
a027cb4
Include xc-avoidance scripts in PREFIX/bin
mingwandroid Mar 6, 2018
b405b11
More Windows fixes
mingwandroid Mar 6, 2018
0209af2
Some more Windows fixes, install Python 2.7 in build, remove the hack…
mingwandroid Mar 7, 2018
4b6efb4
Minor cleanup
mingwandroid Mar 7, 2018
cfc494b
Must merge build and host on Linux due to webengine fun
mingwandroid Mar 9, 2018
a0332cb
Stop skipping any components except wayland
mingwandroid Mar 10, 2018
eb09816
Add run_exports and CoreLocation.framework
mingwandroid Mar 12, 2018
d395e91
Add -ltcg and -reduce-relocations
mingwandroid Mar 13, 2018
f437e08
Optimize for size and improve the flags used for that
mingwandroid Mar 14, 2018
8e1de96
Add placeholder patch for experimenting with -optimize-size on Linux …
mingwandroid Mar 15, 2018
994f88b
No new dtags please
mingwandroid Mar 20, 2018
a3a773c
qtscript: REFERENCED_FROM_ASM for non-GCC compilers
mingwandroid Mar 20, 2018
7c8da1f
Workaround lack of qmake.exe or mkspecs on Windows
mingwandroid Mar 21, 2018
874a9d3
Windows workaround for lack of QMAKE_SPEC/QMAKE_XSPEC
mingwandroid Mar 23, 2018
60ccb57
Add dbus for macOS
mingwandroid Mar 24, 2018
552c449
Add vc feature back
mingwandroid Apr 3, 2018
5cb652a
Update to 5.9.5, use the published md5 sums and include opengl32sw.dl…
mingwandroid Apr 12, 2018
32dd49e
Fix for Windows
mingwandroid Apr 13, 2018
ea1c9d2
We cannot use Python 3 in-build and do not have vc2008 libarchive so …
mingwandroid Apr 13, 2018
4d4aa0a
Actually remove libarchive
mingwandroid Apr 13, 2018
a02b757
We now have a working libarchive for VC9 so can unpack 7zs
mingwandroid Apr 25, 2018
4ae7ec2
Bump build number to build against new deps
mingwandroid May 29, 2018
63f9cf7
Remove the OpenGL dlls
mingwandroid May 29, 2018
676379b
Qt needs a C compiler
mingwandroid Jun 1, 2018
152a0b2
Update to 5.9.6
mingwandroid Jun 11, 2018
5bcfeab
Get rid of the absolutely awful macOS pre/post link scripts
mingwandroid Jun 11, 2018
3b7f79d
Windows fixes
mingwandroid Jun 26, 2018
1bfc646
Bump Qt version for rebuild against new deps
mingwandroid Jul 22, 2018
91846ce
Fix https://github.com/spyder-ide/spyder/issues/7693 (hopefully)
mingwandroid Aug 16, 2018
103ecf9
Use QtCharts in the test
mingwandroid Aug 16, 2018
1c3de8f
Add CDT packages now we use GUI stuff in test
mingwandroid Aug 24, 2018
e7ae0ed
First go at fixing some winrt issue
mingwandroid Aug 24, 2018
6602b78
Force vs2017
mingwandroid Aug 28, 2018
74339fd
Fix patch
mingwandroid Aug 28, 2018
28f68bb
Fix win-32 build (https://codereview.qt-project.org/#/c/236948/)
mingwandroid Aug 28, 2018
770fb44
Fix patch
mingwandroid Aug 28, 2018
01d85f2
Add webengine tests and Windows tests
mingwandroid Aug 30, 2018
150d886
Missed a bit
mingwandroid Aug 30, 2018
6db41e1
Fix tests
mingwandroid Aug 30, 2018
a7844e3
Add missing ninja dependency
mingwandroid Sep 2, 2018
44559c2
Add missing file
mingwandroid Sep 3, 2018
eed56aa
Fix tests
mingwandroid Sep 3, 2018
b526386
Fix build on ubuntu, add cups (WIP, broken)
mingwandroid Sep 24, 2018
02b8e36
Update to 5.9.7
mingwandroid Oct 24, 2018
7353c9f
Back to zips for Windows, Qt still has the sylink-before-target issue…
mingwandroid Oct 24, 2018
f9f569d
Use .conda as qtlibinfix
mingwandroid Oct 24, 2018
f938a68
Qt 5.9.7 progress
mingwandroid Oct 25, 2018
829e55a
Backport OpenSSL 1.1 backend
mingwandroid Oct 25, 2018
d50954a
Some minor fixes
mingwandroid Oct 25, 2018
e6a0f15
Not much
mingwandroid Oct 25, 2018
1650770
WIP fixing for qtlibinfix
mingwandroid Oct 27, 2018
d8190de
Try a different way to get QT_LIBINFIX
mingwandroid Oct 27, 2018
4ddff21
And more QT_LIBINFIX
mingwandroid Oct 29, 2018
b3643fa
WIP .. keeping backups before trying new way
mingwandroid Oct 29, 2018
7b51a2b
More WIP
mingwandroid Oct 29, 2018
cc9dc68
Nearly there with qtlibinfix
mingwandroid Oct 29, 2018
d3114ed
Do not use qtlibinfix on macOS
mingwandroid Dec 14, 2018
3b89332
MNT: Re-rendered with conda-build 3.17.5, conda-smithy 3.2.9, and con…
mariusvniekerk Jan 19, 2019
d15c156
build number bump
mariusvniekerk Jan 19, 2019
ecfd0dc
Merge remote-tracking branch 'origin/master' into repin
mariusvniekerk Mar 3, 2019
72e946b
Merge remote-tracking branch 'AnacondaRecipes/master' into repin
mariusvniekerk Mar 3, 2019
450a0a1
MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and co…
conda-forge-admin Mar 3, 2019
92572f7
Create conda_build_config.yaml
mariusvniekerk Mar 3, 2019
f8b1bde
Update azure-pipelines-linux.yml
mariusvniekerk Mar 3, 2019
b2d5fd9
Update azure-pipelines-osx.yml
mariusvniekerk Mar 3, 2019
e1c91ac
Update azure-pipelines-win.yml
mariusvniekerk Mar 3, 2019
2acd0c5
Update conda_build_config.yaml
mariusvniekerk Mar 3, 2019
3f3c290
MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and co…
conda-forge-admin Mar 3, 2019
4b52c6c
Update build.sh
mariusvniekerk Mar 3, 2019
3fc9fc0
Update azure-pipelines-linux.yml
mariusvniekerk Mar 4, 2019
777156f
Update azure-pipelines-osx.yml
mariusvniekerk Mar 4, 2019
55be3f3
Update azure-pipelines-win.yml
mariusvniekerk Mar 4, 2019
b98cd15
MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.3.2, and con…
conda-forge-admin Apr 7, 2019
9681bf8
Address Isuruf review
ccordoba12 Apr 22, 2019
e367b5d
Add missing run dependencies
ccordoba12 Apr 22, 2019
f7e363e
MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.3.3, and con…
conda-forge-admin Apr 22, 2019
9dbd32b
Try with C disk in Azure/Windows
ccordoba12 Apr 22, 2019
9d508e1
build macOS on Azure
ocefpaf Apr 22, 2019
2e90eef
MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.3.3, and con…
conda-forge-admin Apr 22, 2019
b51ba7a
these two should be added to the re-render
ocefpaf Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if [[ ${HOST} =~ .*linux.* ]]; then
export CXX=${GXX}

mkdir -p "${SRC_DIR}/openssl_hack"
conda install -c https://repo.continuum.io/pkgs/main \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought that conda-build did not even allow for that :-/

conda install -c conda-forge \
--no-deps --yes --copy --prefix "${SRC_DIR}/openssl_hack" \
openssl=${openssl}
export OPENSSL_LIBS="-L${SRC_DIR}/openssl_hack/lib -lssl -lcrypto"
Expand Down
4 changes: 1 addition & 3 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
MACOSX_DEPLOYMENT_TARGET: # [osx]
- '10.12' # [osx]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@isuruf and @mingwandroid is the failure here related to 10.10? Should we force 10.12 for this build?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe macOS SDK 10.10 is what AD targets. We don't have a conda_build_config.yaml for Qt (or at least didn't for 5.9).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I'm quite lost in all the commit here. I'm also trying from a "fresh" PR based on AR but there I'm getting many undefined reference to dbus stuff, like:

lib/libQt5WebEngineCore.so: undefined reference to `dbus_message_set_serial@LIBDBUS_1_3'

In the past we had dbus from yum_requirements.txt but now we have a package in host. Not sure how to fix that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already fixed that in

e367b5d

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fixing run_exports in dbus so we can try to keep the recipe as close as possible to AR.

CONDA_BUILD_SYSROOT: # [osx]
- /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk # [osx]
- '10.10' # [osx]