GeezerVison is showing github.com — Fix legacy Couchbase builds on Ubuntu 26.04 · setup-php/setup-php@cf194af
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: src/scripts/extensions/couchbase.sh +2-1Lines changed: 2 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -8,7 +8,7 @@ add_couchbase_clibs() { |
8 | 8 | release=$(get -s -n "" "$trunk"/latest | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1) |
9 | 9 | fi |
10 | 10 | [[ "$VERSION_ID" = "24.04" || "$VERSION_ID" = "26.04" ]] && vid=22.04 || vid="$VERSION_ID" |
11 | | - [ "$VERSION_CODENAME" = "noble" ] && vcn=jammy || vcn="$VERSION_CODENAME" |
| 11 | + [[ "$VERSION_CODENAME" = "noble" || "$VERSION_CODENAME" = "resolute" ]] && vcn=jammy || vcn="$VERSION_CODENAME" |
12 | 12 | deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${vid/./}_${vcn}_amd64.tar" |
13 | 13 | get -q -n /tmp/libcouchbase.tar "$deb_url" |
14 | 14 | if ! [ -e /tmp/libcouchbase.tar ] || ! file /tmp/libcouchbase.tar | grep -q 'tar archive'; then |
@@ -59,6 +59,7 @@ add_couchbase() { |
59 | 59 | ext=$(get_couchbase_version) |
60 | 60 | fi |
61 | 61 | if [[ "$ext" =~ couchbase-[2-3].+ ]]; then |
| 62 | + export COUCHBASE_CONFIGURE_PREFIX_OPTS="${COUCHBASE_CONFIGURE_PREFIX_OPTS:-} SED=sed CFLAGS=-Wno-error=incompatible-pointer-types" |
62 | 63 | add_couchbase_clibs "$ext" >/dev/null 2>&1 |
63 | 64 | else |
64 | 65 | add_couchbase_cxxlibs >/dev/null 2>&1 |
|