On Jan 8, 2008 12:03 AM, <damien.carbery at sun.com> wrote:
> Author: dcarbery
> Repository: /svn/jds/spec-files
> * patches/glib-04-sed-i.diff: Renamed from 05. Reworked too.
Hi Damien and everybody :)
Something broke down due the rework I'm afraid, SUNWgnome-base-libs
fails to build and it seems to go wrong at patch applying time:
pkgbuild: Patch #4 (glib-04-sed-i.diff):
pkgbuild: + /usr/bin/gpatch --fuzz=0 --unified -p 1
pkgbuild: patching file glib/Makefile.am
pkgbuild: Hunk #1 FAILED at 326.
pkgbuild: 1 out of 1 hunk FAILED -- saving rejects to file glib/Makefile.am.rej
pkgbuild: Bad exit status from
/var/tmp/pkgbuild-build/pkgbuild-tmp-1.258566 (%prep)
--- command output ends --- finished at Tue Jan 8 14:09:36 CET 2008
INFO: pkgbuild -ba finished at Tue Jan 8 14:09:36 CET 2008
ERROR: SUNWgnome-base-libs FAILED
INFO: Check the build log in /tmp/SUNWgnome-base-libs.log for details
The output of Makefile.am.rej is:
***************
*** 326,334 ****
install-exec-hook:
for sf in ${auto_config_binscripts} ; do \
- sed -i "$(DESTDIR)$(bindir)/$$sf" \
-e '1,24s|^ *...@pkginstall_configvars_in24lines@|
${CONFIGVARS}|' \
- -e '1,1s|#!/usr/bin/env
python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' || exit $$? ; \
done
endif
--- 326,335 ----
install-exec-hook:
for sf in ${auto_config_binscripts} ; do \
+ sed \
-e '1,24s|^ *...@pkginstall_configvars_in24lines@|
${CONFIGVARS}|' \
+ -e '1,1s|#!/usr/bin/env
python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|'
"$(DESTDIR)$(bindir)/$$sf" > "$(DESTDIR)$(bindir)/$$sf.xx" || exit $$?
; \
+ mv "$(DESTDIR)$(bindir)/$$sf.xx" "$(DESTDIR)$(bindir)/$$sf" ; \
done
endif
--
Patrick
