[libmariadb] Fix patch #10043

JackBoosY · 2020-02-13T01:35:13Z

Due to version update, fix outdated patche.

Related: #10024.

Note: this port doesn't contain any features.

LilyWangL · 2020-02-14T09:34:26Z

/azp run

MoustafaFL · 2020-02-16T09:44:21Z

I added the commits by myself to my vcpkg folder (in my PC) and tried to rebuild still same error or adding it by myself isn't an option?

JackBoosY · 2020-02-16T13:57:29Z

@Moustafa1337 Could you provide failure logs?

jo3bingham · 2020-02-17T18:18:45Z

I checked this branch out and tested it; works for me.

JackBoosY · 2020-02-19T02:21:18Z

@Moustafa1337 @ainz7892 please pull this branch.

MoustafaFL · 2020-02-19T09:30:23Z

Still

Computing installation plan...
The following packages will be built and installed:
libmariadb[core]:x64-windows
Starting package 1/1: libmariadb:x64-windows
Building package libmariadb[core]:x64-windows...
-- Using cached E:/vcpkg/downloads/MariaDB-mariadb-connector-c-8e9c3116105d9a998a60991b7f4ba910d454d4b1.tar.gz
-- Extracting source E:/vcpkg/downloads/MariaDB-mariadb-connector-c-8e9c3116105d9a998a60991b7f4ba910d454d4b1.tar.gz
-- Applying patch md.patch
CMake Error at scripts/cmake/vcpkg_apply_patches.cmake:50 (message):
Applying patch failed. Patch needs to be updated to work with source being
used by vcpkg!
Call Stack (most recent call first):
scripts/cmake/vcpkg_extract_source_archive_ex.cmake:134 (vcpkg_apply_patches)
scripts/cmake/vcpkg_from_github.cmake:139 (vcpkg_extract_source_archive_ex)
ports/libmariadb/portfile.cmake:8 (vcpkg_from_github)
scripts/ports.cmake:90 (include)

Error: Building package libmariadb:x64-windows failed with: BUILD_FAILED
Please ensure you're using the latest portfiles with .\vcpkg update, then
submit an issue at https://github.com/Microsoft/vcpkg/issues including:
Package: libmariadb:x64-windows
Vcpkg version: 2020.02.04-nohash

Additionally, attach any relevant sections from the log files above.

JackBoosY · 2020-02-19T15:54:07Z

@Moustafa1337 Could you provide your cmake version?

MoustafaFL · 2020-02-19T18:04:26Z

cmake version 3.16.4

NoFr1ends · 2020-02-19T18:46:18Z

@JackBoosY Applying this patch fixes the issue for me

JackBoosY · 2020-02-20T02:25:18Z

/azp run

Derimax3

-- Extracting source C:/Users/Adorius Black/vcpkg/downloads/MariaDB-mariadb-connector-c-8e9c3116105d9a998a60991b7f4ba910d454d4b1.tar.gz
-- Applying patch md.patch
CMake Error at scripts/cmake/vcpkg_apply_patches.cmake:50 (message):
Applying patch failed. Patch needs to be updated to work with source being
used by vcpkg!
Call Stack (most recent call first):
scripts/cmake/vcpkg_extract_source_archive_ex.cmake:134 (vcpkg_apply_patches)
scripts/cmake/vcpkg_from_github.cmake:139 (vcpkg_extract_source_archive_ex)
ports/libmariadb/portfile.cmake:8 (vcpkg_from_github)
scripts/ports.cmake:90 (include)

Error: Building package libmariadb:x64-windows failed with: BUILD_FAILED
Please ensure you're using the latest portfiles with .\vcpkg update, then
submit an issue at https://github.com/Microsoft/vcpkg/issues including:
Package: libmariadb:x64-windows
Vcpkg version: 2020.02.04-nohash

JackBoosY · 2020-02-21T12:12:37Z

@Moustafa1337 @NoFr1ends @Derimax3 After installed cmake 3.16.4, I still can't repro that.
Could you provide failure logs VCPKG_PATH/buildtrees/libmariadb/patch-x86-windows-*-err.log ?

Derimax3 · 2020-02-21T13:34:33Z

@Moustafa1337 @NoFr1ends @Derimax3 After installed cmake 3.16.4, I still can't repro that.
Could you provide failure logs VCPKG_PATH/buildtrees/libmariadb/patch-x86-windows-*-err.log ?

Hello JackBoosY this is log from patch-x86-windows-0-err
error: corrupt patch at line 13

Derimax3 · 2020-02-21T13:38:43Z

@Moustafa1337 @NoFr1ends @Derimax3 After installed cmake 3.16.4, I still can't repro that.
Could you provide failure logs VCPKG_PATH/buildtrees/libmariadb/patch-x86-windows-*-err.log ?

Should I reinstall Cmake? Sorry i am totaly beginner in this. What version should i have? Because i have cmake-3.17.0 .

JackBoosY · 2020-02-21T13:51:39Z

@Derimax3 I think it has nothing to do with cmake version.
Can you delete VCPKG_PATH/buildtrees/libmariadb/src/ and try again?

Please provide full log.

Derimax3 · 2020-02-21T14:04:55Z

@Derimax3 I think it has nothing to do with cmake version.
Can you delete VCPKG_PATH/buildtrees/libmariadb/src/ and try again?

Please provide full log.

I deleted /buildtrees/libmariadb/src/ and still same error.

C:\Users\Adorius Black\vcpkg>vcpkg install boost-iostreams:x64-windows boost-asio:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-variant:x64-windows boost-lockfree:x64-windows luajit:x64-windows libmariadb:x64-windows pugixml:x64-windows mpir:x64-windows cryptopp:x64-windows
Computing installation plan...
The following packages are already installed:
boost-asio[core]:x64-windows
boost-filesystem[core]:x64-windows
boost-iostreams[core]:x64-windows
boost-lockfree[core]:x64-windows
boost-system[core]:x64-windows
boost-variant[core]:x64-windows
cryptopp[core]:x64-windows
The following packages will be built and installed:
libmariadb[core]:x64-windows
luajit[core]:x64-windows
mpir[core]:x64-windows
pugixml[core]:x64-windows
Package boost-filesystem:x64-windows is already installed
Package boost-asio:x64-windows is already installed
Package boost-iostreams:x64-windows is already installed
Package boost-lockfree:x64-windows is already installed
Package boost-system:x64-windows is already installed
Package boost-variant:x64-windows is already installed
Package cryptopp:x64-windows is already installed
Starting package 1/4: libmariadb:x64-windows
Building package libmariadb[core]:x64-windows...
-- Using cached C:/Users/Adorius Black/vcpkg/downloads/MariaDB-mariadb-connector-c-8e9c3116105d9a998a60991b7f4ba910d454d4b1.tar.gz
-- Extracting source C:/Users/Adorius Black/vcpkg/downloads/MariaDB-mariadb-connector-c-8e9c3116105d9a998a60991b7f4ba910d454d4b1.tar.gz
-- Applying patch md.patch
CMake Error at scripts/cmake/vcpkg_apply_patches.cmake:50 (message):
Applying patch failed. Patch needs to be updated to work with source being
used by vcpkg!
Call Stack (most recent call first):
scripts/cmake/vcpkg_extract_source_archive_ex.cmake:134 (vcpkg_apply_patches)
scripts/cmake/vcpkg_from_github.cmake:139 (vcpkg_extract_source_archive_ex)
ports/libmariadb/portfile.cmake:8 (vcpkg_from_github)
scripts/ports.cmake:90 (include)

Error: Building package libmariadb:x64-windows failed with: BUILD_FAILED
Please ensure you're using the latest portfiles with .\vcpkg update, then
submit an issue at https://github.com/Microsoft/vcpkg/issues including:
Package: libmariadb:x64-windows
Vcpkg version: 2020.02.04-nohash

Additionally, attach any relevant sections from the log files above.

JackBoosY · 2020-02-21T14:20:47Z

@ras0219-msft Can you take a look?
I still can't repro it.

NoFr1ends · 2020-02-21T14:48:17Z

@JackBoosY You maybe misunderstood me but your PR is working for me.

Toxe · 2020-02-21T18:51:35Z

I have had the same issue when trying to install libmariadb (error while trying to apply the md.patch file) and this PR fixes it on Mac, Linux and Windows.

Can we merge this into master?

NoFr1ends · 2020-02-21T19:33:36Z

@Derimax3 Are you sure that you have checked out this PR instead of the master, or at least have applied this PR as a patch to your vcpkg folder?

Derimax3 · 2020-02-21T22:07:33Z

I have had the same issue when trying to install libmariadb (error while trying to apply the md.patch file) and this PR fixes it on Mac, Linux and Windows.

Can we merge this into master?

Hi how you fixed it ? Can you tell me please?

NoFr1ends · 2020-02-21T22:21:52Z

I have had the same issue when trying to install libmariadb (error while trying to apply the md.patch file) and this PR fixes it on Mac, Linux and Windows.
Can we merge this into master?

Hi how you fixed it ? Can you tell me please?

You should learn how to use git and GitHub first.
Download: https://patch-diff.githubusercontent.com/raw/microsoft/vcpkg/pull/10043.patch
And then you can do for example git apply 10043.patch

Derimax3 · 2020-02-21T23:23:10Z

I have had the same issue when trying to install libmariadb (error while trying to apply the md.patch file) and this PR fixes it on Mac, Linux and Windows.
Can we merge this into master?

Hi how you fixed it ? Can you tell me please?

You should learn how to use git and GitHub first.
Download: https://patch-diff.githubusercontent.com/raw/microsoft/vcpkg/pull/10043.patch
And then you can do for example git apply 10043.patch

One more question. How to download it? Just save it in vcpkg as text with name 10043.patch? or should i donwload it in git? Anyway Thank you. You pushed me little bit

NoFr1ends · 2020-02-21T23:29:03Z

I have had the same issue when trying to install libmariadb (error while trying to apply the md.patch file) and this PR fixes it on Mac, Linux and Windows.
Can we merge this into master?

Hi how you fixed it ? Can you tell me please?

You should learn how to use git and GitHub first.
Download: https://patch-diff.githubusercontent.com/raw/microsoft/vcpkg/pull/10043.patch
And then you can do for example git apply 10043.patch

One more question. How to download it? Just save it in vcpkg as text with name 10043.patch? or should i donwload it in git?

Just download it so you have a file called 10043.patch (or anything else, but then you have to change the git apply command)

Derimax3 · 2020-02-21T23:39:00Z

I have had the same issue when trying to install libmariadb (error while trying to apply the md.patch file) and this PR fixes it on Mac, Linux and Windows.
Can we merge this into master?

Hi how you fixed it ? Can you tell me please?

You should learn how to use git and GitHub first.
Download: https://patch-diff.githubusercontent.com/raw/microsoft/vcpkg/pull/10043.patch
And then you can do for example git apply 10043.patch

One more question. How to download it? Just save it in vcpkg as text with name 10043.patch? or should i donwload it in git?

Just download it so you have a file called 10043.patch (or anything else, but then you have to change the git apply command)

I downloaded it and i did i use this command: git apply 10043.patch

error: patch failed: ports/libmariadb/CONTROL:1
error: ports/libmariadb/CONTROL: patch does not apply
error: patch failed: ports/libmariadb/md.patch:1
error: ports/libmariadb/md.patch: patch does not apply
:-/

NoFr1ends · 2020-02-21T23:49:32Z

On which branch are you and are you on the newest version?

Derimax3 · 2020-02-21T23:59:51Z

On which branch are you and are you on the newest version?

https://github.com/otland/forgottenserver/wiki/Compiling-on-Windows-(vcpkg)
I have cmake-3.17.0

NoFr1ends · 2020-02-22T00:01:08Z

On which branch are you and are you on the newest version?

https://github.com/otland/forgottenserver/wiki/Compiling-on-Windows-(vcpkg)
I have cmake-3.17.0

That wasn't my question..
Can you please do git pull then git apply 10043.patch again?

Derimax3 · 2020-02-22T00:06:38Z

On which branch are you and are you on the newest version?

https://github.com/otland/forgottenserver/wiki/Compiling-on-Windows-(vcpkg)
I have cmake-3.17.0

That wasn't my question..
Can you please do git pull then git apply 10043.patch again?

C:\Users\Adorius Black\vcpkg>git pull
Already up to date.

C:\Users\Adorius Black\vcpkg>git apply 10043.patch
error: patch failed: ports/libmariadb/CONTROL:1
error: ports/libmariadb/CONTROL: patch does not apply
error: patch failed: ports/libmariadb/md.patch:1
error: ports/libmariadb/md.patch: patch does not apply

Where should i donwload 10043.patch? Desktop,Vcpkg or it doesnt matter?

Toxe · 2020-02-22T00:49:53Z

I have had the same issue when trying to install libmariadb (error while trying to apply the md.patch file) and this PR fixes it on Mac, Linux and Windows.
Can we merge this into master?

Hi how you fixed it ? Can you tell me please?

In this case you don't even have to bother with applying a PR to your code, simply just download the whole contents of the md.patch file from the PR and copy it to ports/libmariadb and you are done. And make of course sure that you have a clean install of Vcpkg.

Because this was basically just what I did when I tested this PR, because after I initially ran into this issue I had fixed it on my own and only after I was done I had the idea to actually look if other people ran into this issue as well and if someone already submitted a PR, which was of course the case. ;-)

JackBoosY · 2020-02-22T02:30:06Z

Please follow the steps below:

git clone https://github.com/JackBoosY/vcpkg.git
git checkout -b dev/jack/10024 origin/dev/jack/10024
./bootstrap-vcpkg.bat
./vcpkg install libmariadb

OlafvdSpek · 2020-02-22T08:49:04Z

Please follow the steps below:

git clone https://github.com/JackBoosY/vcpkg.git

cd vcpkg

git checkout -b dev/jack/10024 origin/dev/jack/10024

./bootstrap-vcpkg.bat

./vcpkg install libmariadb

Building package libmariadb[core]:x86-windows... done
Installing package libmariadb[core]:x86-windows...
Installing package libmariadb[core]:x86-windows... done
Elapsed time for package libmariadb:x86-windows: 2.286 min

Total elapsed time: 2.286 min

Toxe · 2020-02-22T10:59:47Z

There is another way to just switch to a branch that contains exactly the changes of this PR:

git clone https://github.com/Microsoft/vcpkg.git
cd vcpkg
git fetch origin pull/10043/head:pr-fix-libmariadb
git checkout pr-fix-libmariadb
./bootstrap-vcpkg.sh
./vcpkg install libmariadb

This creates a new branch pr-fix-libmariadb from this PR.

MoustafaFL · 2020-02-22T15:40:50Z

There is another way to just switch to a branch that contains exactly the changes of this PR:
git clone https://github.com/Microsoft/vcpkg.git
cd vcpkg
git fetch origin pull/10043/head:pr-fix-libmariadb
git checkout pr-fix-libmariadb
./bootstrap-vcpkg.sh
./vcpkg install libmariadb
This creates a new branch pr-fix-libmariadb from this PR.

Thanks this fixed it for me, other solutions didn't work.

strega-nil · 2020-02-26T00:41:29Z

This looks good! (although I wonder how it ever worked...) Thanks! 😄

JackBoosY · 2020-02-26T02:04:33Z

@strega-nil I just judate the patch. Looking at the changes in detail, you will find that the source code content related to the patch has been changed.

OlafvdSpek · 2020-02-26T10:35:14Z

Shouldn't a test have caught the build failure before it was merged into master?

JackBoosY · 2020-02-27T02:39:54Z

@OlafvdSpek Well, obviously the pipeline test didn't catch this regression.

OlafvdSpek · 2020-02-27T08:21:39Z

Wouldn't that be an issue by itself?
They should've caught this right?

strega-nil · 2020-02-28T03:30:09Z

@OlafvdSpek because mariadb clashes with mysql, we don't test it; this is an issue with our current CI system, and will be fixed at some point. Sorry!

[libmariadb] Fix patch

3a8fec0

JackBoosY added the info:internal This PR or Issue was filed by the vcpkg team. label Feb 13, 2020

JackBoosY assigned LilyWangL Feb 13, 2020

This was referenced Feb 13, 2020

Fix baseline error #10051

Merged

[libmariadb] build failure #10024

Closed

LilyWangL marked this pull request as ready for review February 20, 2020 13:02

LilyWangL added the info:reviewed Pull Request changes follow basic guidelines label Feb 20, 2020

Derimax3 reviewed Feb 21, 2020

View reviewed changes

JackBoosY removed the info:reviewed Pull Request changes follow basic guidelines label Feb 21, 2020

JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Feb 24, 2020

strega-nil merged commit 5d69273 into microsoft:master Feb 26, 2020

JackBoosY deleted the dev/jack/10024 branch February 26, 2020 01:54

[libmariadb] Fix patch #10043

[libmariadb] Fix patch #10043

Conversation

JackBoosY commented Feb 13, 2020

LilyWangL commented Feb 14, 2020

MoustafaFL commented Feb 16, 2020

JackBoosY commented Feb 16, 2020

jo3bingham commented Feb 17, 2020

JackBoosY commented Feb 19, 2020

MoustafaFL commented Feb 19, 2020 • edited

JackBoosY commented Feb 19, 2020

MoustafaFL commented Feb 19, 2020

NoFr1ends commented Feb 19, 2020

JackBoosY commented Feb 20, 2020

Derimax3 left a comment

Choose a reason for hiding this comment

JackBoosY commented Feb 21, 2020

Derimax3 commented Feb 21, 2020

Derimax3 commented Feb 21, 2020

JackBoosY commented Feb 21, 2020

Derimax3 commented Feb 21, 2020

JackBoosY commented Feb 21, 2020

NoFr1ends commented Feb 21, 2020

Toxe commented Feb 21, 2020

NoFr1ends commented Feb 21, 2020

Derimax3 commented Feb 21, 2020

NoFr1ends commented Feb 21, 2020 • edited

Derimax3 commented Feb 21, 2020 • edited

NoFr1ends commented Feb 21, 2020

Derimax3 commented Feb 21, 2020

NoFr1ends commented Feb 21, 2020

Derimax3 commented Feb 21, 2020

NoFr1ends commented Feb 22, 2020

Derimax3 commented Feb 22, 2020

Toxe commented Feb 22, 2020

JackBoosY commented Feb 22, 2020

OlafvdSpek commented Feb 22, 2020

Toxe commented Feb 22, 2020

MoustafaFL commented Feb 22, 2020

strega-nil commented Feb 26, 2020

JackBoosY commented Feb 26, 2020

OlafvdSpek commented Feb 26, 2020

JackBoosY commented Feb 27, 2020

OlafvdSpek commented Feb 27, 2020

strega-nil commented Feb 28, 2020

MoustafaFL commented Feb 19, 2020 •

edited

NoFr1ends commented Feb 21, 2020 •

edited

Derimax3 commented Feb 21, 2020 •

edited