mirror of
https://github.com/ivabus/pantry
synced 2024-11-22 08:25:07 +03:00
Props no longer need escaping which means fix them
This commit is contained in:
parent
3fa63bdd37
commit
cc24a480c1
5 changed files with 15 additions and 20 deletions
|
@ -35,10 +35,10 @@ build:
|
|||
prop: |
|
||||
/^REMOVE_MATCHES_FROM_LISTS\(files hfiles/ {
|
||||
i\\
|
||||
string(REPLACE "+" "\\\\\\\\+" ESCAPED_FOLLY_DIR "\\\${FOLLY_DIR}")
|
||||
string(REPLACE "+" "\\\\\\\\+" ESCAPED_FOLLY_DIR "\${FOLLY_DIR}")
|
||||
}
|
||||
|
||||
s/\^\\\$\{FOLLY_DIR\}/^\\\$\{ESCAPED_FOLLY_DIR\}/g
|
||||
s/\^\$\{FOLLY_DIR\}/^\$\{ESCAPED_FOLLY_DIR\}/g
|
||||
|
||||
- cmake $ARGS -DBUILD_SHARED_LIBS=ON -S . -B shared
|
||||
- cmake --build shared
|
||||
|
|
|
@ -21,8 +21,7 @@ build:
|
|||
working-directory: ${{prefix}}/bin
|
||||
prop: |
|
||||
#!/bin/bash
|
||||
|
||||
\$(dirname \$0)/../terminal-notifier.app/Contents/MacOS/terminal-notifier \$*
|
||||
$(dirname $0)/../terminal-notifier.app/Contents/MacOS/terminal-notifier $*
|
||||
|
||||
provides:
|
||||
- bin/terminal-notifier
|
||||
|
|
|
@ -33,7 +33,7 @@ build:
|
|||
MANM_ROFF=mandoc_roff
|
||||
MANM_EQN=eqn
|
||||
MANM_TBL=tbl
|
||||
OSNAME='$(uname -a)'
|
||||
OSNAME=$(uname -a)
|
||||
MANPATH_DEFAULT={{prefix}}/share/man
|
||||
HAVE_MANPATH=0
|
||||
STATIC=
|
||||
|
|
|
@ -53,16 +53,16 @@ build:
|
|||
cp $PROP {{prefix}}/lib/pkgconfig/netpbm.pc
|
||||
working-directory: stage
|
||||
prop: |
|
||||
prefix=\${pcfiledir}/../..
|
||||
exec_prefix=\${prefix}
|
||||
libdir=\${exec_prefix}/lib
|
||||
includedir=\${prefix}/include/netpbm
|
||||
prefix=${pcfiledir}/../..
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include/netpbm
|
||||
|
||||
Name: Netpbm
|
||||
Description: Graphics utilities
|
||||
Version: {{version}}
|
||||
Libs: -L\${libdir} -lmylibrary
|
||||
Cflags: -I\${includedir}
|
||||
Libs: -L${libdir} -lmylibrary
|
||||
Cflags: -I${includedir}
|
||||
env:
|
||||
CFLAGS: "-Wno-implicit-function-declaration $CFLAGS"
|
||||
provides:
|
||||
|
|
|
@ -28,10 +28,11 @@ build:
|
|||
- run: |
|
||||
sed -i.bak -f $PROP config_{darwin,linux}.go
|
||||
rm config_{darwin,linux}.go.bak
|
||||
working-directory: vendor/github.com/containers/common/pkg/config
|
||||
working-directory:
|
||||
vendor/github.com/containers/common/pkg/config
|
||||
prop: |-
|
||||
s_\(^var defaultHelperBinariesDir.*\)_\
|
||||
\1\n "\$BINDIR/../../../$GVISOR_MAJOR/bin",_
|
||||
\1\n "$BINDIR/../../../github.com/containers/gvisor-tap-vsock/v{{deps.github.com/containers/gvisor-tap-vsock.version.major}}/bin",_
|
||||
|
||||
- mkdir -p "{{ prefix }}"/bin
|
||||
- make --jobs {{ hw.concurrency }} podman-remote
|
||||
|
@ -47,11 +48,6 @@ build:
|
|||
ln -s podman "{{ prefix }}"/bin/podman-remote
|
||||
if: darwin
|
||||
env:
|
||||
# path for gvproxy to add to platform config
|
||||
GVISOR_MAJOR: |-
|
||||
$(cd "{{deps.github.com/containers/gvisor-tap-vsock.prefix}}/../\
|
||||
/v{{deps.github.com/containers/gvisor-tap-vsock.version.major}}" \
|
||||
&& pwd | sed -e "s_$PKGX_DIR/__")
|
||||
CGO_ENABLED: 1
|
||||
linux:
|
||||
EXTRA_LDFLAGS: -buildmode=pie
|
||||
|
|
Loading…
Reference in a new issue