Skip to content

Fix uint ulong, add missing libs for curl, fix Travis#18

Closed
Jan-E wants to merge 3 commits into
php:masterfrom
Jan-E:fix_uint_ulong
Closed

Fix uint ulong, add missing libs for curl, fix Travis#18
Jan-E wants to merge 3 commits into
php:masterfrom
Jan-E:fix_uint_ulong

Conversation

@Jan-E

@Jan-E Jan-E commented Nov 17, 2019

Copy link
Copy Markdown
Contributor

This PR fixes:

  1. The removal of the Windows typedefs uint and ulong:
    https://github.com/php/php-src/blob/PHP-7.4/UPGRADING.INTERNALS#L216
  2. The missing libs, due to recent changes to default libcurl build
    php/php-src@a1ba300#diff-4e6782d127d4f20ec4acfb42474941e5
  3. It fixes the Travis checks, that were failing because of a missing php5-cli

After this PR config.w32 will work for the Windows building of PHP 7.0 up until PHP 7.4

@Jan-E

Jan-E commented Nov 17, 2019

Copy link
Copy Markdown
Contributor Author

BTW: The version 2.5.0 builds of the Windows DLL's already failed because of the missing libs. See the 'make' logs in the zips of https://windows.php.net/downloads/pecl/releases/solr/2.5.0/logs/

If you merge this PR and make a new release (2.5.1 ?) the Windows DLL's for Pecl should be created.

@Jan-E Jan-E changed the title Fix uint ulong & add missing libs for curl Fix uint ulong, add missing libs for curl, fix Travis Nov 17, 2019
@coveralls

coveralls commented Nov 17, 2019

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.3%) to 79.299% when pulling 86af3c4 on Jan-E:fix_uint_ulong into 87d279a on php:master.

stronk7 added a commit to stronk7/macports-ports that referenced this pull request May 10, 2020
Notes:
- It adds a patch file that is 99.99% php/pecl-search_engine-solr#18
  (but with travis, unrelated, and config.w32, conflicting and not used by us, changes taken apart).
- Note I don't know much about the Portfile syntax, so that condition
  was the only way I found to apply the patch only for 7.4.
- With the patch applied and the extension installed, we are getting a
  pass running our (moodle) unit tests. So it seems to work.
- Cannot say much else, :-)
ryandesign pushed a commit to macports/macports-ports that referenced this pull request May 10, 2020
Notes:
- It adds a patch file that is 99.99% php/pecl-search_engine-solr#18
  (but with travis, unrelated, and config.w32, conflicting and not used by us, changes taken apart).
- Note I don't know much about the Portfile syntax, so that condition
  was the only way I found to apply the patch only for 7.4.
- With the patch applied and the extension installed, we are getting a
  pass running our (moodle) unit tests. So it seems to work.
- Cannot say much else, :-)
@php-pulls

Copy link
Copy Markdown

Comment on behalf of omars at php.net:

thanks, merged!

@php-pulls php-pulls closed this Jul 12, 2020
@Jan-E

Jan-E commented Jul 12, 2020

Copy link
Copy Markdown
Contributor Author

@0mars I will submit a new PR today to prepare for PHP8. zend_hash_sort never fails since PHP 5.5.0 and will throw an error in PHP8, so it can be changed now. See php/php-src#3936 (comment)

@0mars

0mars commented Jul 12, 2020

Copy link
Copy Markdown
Collaborator

Thanks @Jan-E appreciate your work, keep it up!!

@0mars

0mars commented Jul 12, 2020

Copy link
Copy Markdown
Collaborator

Does master compile on windows now ? I don't have a windows machine to test

@Jan-E

Jan-E commented Jul 12, 2020

Copy link
Copy Markdown
Contributor Author

I just cloned the repo once again and made a new branch zend-hash-sort-never-fails. Will try it with that branch.

@Jan-E

Jan-E commented Jul 12, 2020

Copy link
Copy Markdown
Contributor Author

#20

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants