Skip to content

[soundtouch] enable static build#19377

Closed
daschuer wants to merge 1 commit intomicrosoft:masterfrom
daschuer:soundtouch_static
Closed

[soundtouch] enable static build#19377
daschuer wants to merge 1 commit intomicrosoft:masterfrom
daschuer:soundtouch_static

Conversation

@daschuer
Copy link
Contributor

@daschuer daschuer commented Aug 5, 2021

Describe the pull request

  • What does your PR fix?

Static build of soundtouch

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    all,!uwp, Yes

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

@NancyLi1013 NancyLi1013 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Aug 6, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2019e507caf9469d8d5c93bfcd3f6d26548ca12 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json
index 850c076..4fa4ff4 100644
--- a/versions/s-/soundtouch.json
+++ b/versions/s-/soundtouch.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "f4202922ea3ee86069d2139332006625e431334d",
+      "git-tree": "5d7286ce3a1cb5028b7a01ff6537444c8d1a1f78",
       "version-string": "2.0.0-7",
       "port-version": 0
     },

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2019e507caf9469d8d5c93bfcd3f6d26548ca12 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 37cc36f..d052d82 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5977,8 +5977,8 @@
       "port-version": 0
     },
     "soundtouch": {
-      "baseline": "2.0.0-7",
-      "port-version": 0
+      "baseline": "2.0.0",
+      "port-version": 7
     },
     "soxr": {
       "baseline": "0.1.3",
diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json
index 850c076..86ab66f 100644
--- a/versions/s-/soundtouch.json
+++ b/versions/s-/soundtouch.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "f4202922ea3ee86069d2139332006625e431334d",
-      "version-string": "2.0.0-7",
-      "port-version": 0
+      "git-tree": "17fa46b1b27b240742aca88ecb585012ed0b6c39",
+      "version-string": "2.0.0",
+      "port-version": 7
     },
     {
       "git-tree": "c70fc01038afbb6850538b0a4789b91c83113a8d",

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2019e507caf9469d8d5c93bfcd3f6d26548ca12 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json
index 0a10064..86ab66f 100644
--- a/versions/s-/soundtouch.json
+++ b/versions/s-/soundtouch.json
@@ -5,11 +5,6 @@
       "version-string": "2.0.0",
       "port-version": 7
     },
-    {
-      "git-tree": "f4202922ea3ee86069d2139332006625e431334d",
-      "version-string": "2.0.0-7",
-      "port-version": 0
-    },
     {
       "git-tree": "c70fc01038afbb6850538b0a4789b91c83113a8d",
       "version-string": "2.0.0-6",

@daschuer daschuer force-pushed the soundtouch_static branch from 4a3a506 to 5a97237 Compare August 7, 2021 22:20
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 57bd7102d9fd880daa1b0958692294c4a125f6d8 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json
index 0a10064..86ab66f 100644
--- a/versions/s-/soundtouch.json
+++ b/versions/s-/soundtouch.json
@@ -5,11 +5,6 @@
       "version-string": "2.0.0",
       "port-version": 7
     },
-    {
-      "git-tree": "f4202922ea3ee86069d2139332006625e431334d",
-      "version-string": "2.0.0-7",
-      "port-version": 0
-    },
     {
       "git-tree": "c70fc01038afbb6850538b0a4789b91c83113a8d",
       "version-string": "2.0.0-6",

@daschuer daschuer force-pushed the soundtouch_static branch from 5a97237 to edb88b8 Compare August 7, 2021 22:34
@daschuer
Copy link
Contributor Author

daschuer commented Aug 7, 2021

Done

@NancyLi1013
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@daschuer
Copy link
Contributor Author

daschuer commented Aug 9, 2021

Done

@NancyLi1013
Copy link
Contributor

Needs to solve the conflicts here. @daschuer

@Be-ing
Copy link
Contributor

Be-ing commented Sep 29, 2021

This PR is obsolete. #20017 implemented support for static builds.

@daschuer
Copy link
Contributor Author

The only missing bit was the ci.baseline.txt change. I have rebased this PR accordingly.

BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Sep 29, 2021
https://dev.azure.com/vcpkg/public/_build/results?buildId=60445

PASSING, REMOVE FROM FAIL LIST: soundtouch:x64-windows-static
Probably fixed by: microsoft#19377

REGRESSION: mosquitto:x86-windows
REGRESSION: mosquitto:x64-windows
Probably broken by: microsoft#20148

```
The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets.

    D:/packages/mosquitto_x86-windows/bin/mosquitto_ctrl.exe

The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets.

    D:/packages/mosquitto_x86-windows/debug/bin/mosquitto_ctrl.exe

Found 2 error(s). Please correct the portfile:
    C:\a\1\s\ports\mosquitto\portfile.cmake
-- Performing post-build validation done
```

The upstream build system has this:

```
option(WITH_CJSON "Build with cJSON support (required for dynamic security plugin and useful for mosquitto_sub)?" ON)
if (WITH_CJSON)
    FIND_PACKAGE(cJSON)
    if (CJSON_FOUND)
	    message(STATUS ${CJSON_FOUND})
    else (CJSON_FOUND)
	    message(STATUS "Optional dependency cJSON not found. Some features will be disabled.")
    endif(CJSON_FOUND)
endif()
```

and indeed, I repro the problem if cjson is installed first. Disable WITH_CJSON as a fix.

OSX never finishing: Hopefully fixed by microsoft#20388
@BillyONeal
Copy link
Member

This PR is also (accidentally) included in #20435

@BillyONeal BillyONeal added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Sep 29, 2021
BillyONeal added a commit that referenced this pull request Sep 30, 2021
https://dev.azure.com/vcpkg/public/_build/results?buildId=60445

PASSING, REMOVE FROM FAIL LIST: soundtouch:x64-windows-static
Probably fixed by: #19377

REGRESSION: mosquitto:x86-windows
REGRESSION: mosquitto:x64-windows
Probably broken by: #20148

```
The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets.

    D:/packages/mosquitto_x86-windows/bin/mosquitto_ctrl.exe

The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets.

    D:/packages/mosquitto_x86-windows/debug/bin/mosquitto_ctrl.exe

Found 2 error(s). Please correct the portfile:
    C:\a\1\s\ports\mosquitto\portfile.cmake
-- Performing post-build validation done
```

The upstream build system has this:

```
option(WITH_CJSON "Build with cJSON support (required for dynamic security plugin and useful for mosquitto_sub)?" ON)
if (WITH_CJSON)
    FIND_PACKAGE(cJSON)
    if (CJSON_FOUND)
	    message(STATUS ${CJSON_FOUND})
    else (CJSON_FOUND)
	    message(STATUS "Optional dependency cJSON not found. Some features will be disabled.")
    endif(CJSON_FOUND)
endif()
```

and indeed, I repro the problem if cjson is installed first. Disable WITH_CJSON as a fix.

OSX never finishing: Hopefully fixed by #20388
@BillyONeal
Copy link
Member

Thanks for your contribution! Unfortunately it looks like all the edits here are already applied in master :)

@BillyONeal BillyONeal closed this Sep 30, 2021
@daschuer daschuer deleted the soundtouch_static branch January 5, 2023 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants