Skip to content

V
vlc
Commit 787c763b authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Jean-Paul Saman
Browse files
Options

Bailout when rpmbuild fails.

parent 1ec022da
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
extras/contrib/src/Makefile
View file @ 787c763b
...@@ -193,15 +193,15 @@ define RPM_PREPARE ...@@ -193,15 +193,15 @@ define RPM_PREPARE
endef endef
define RPM_BUILD_SPEC define RPM_BUILD_SPEC
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc -ba rpm/SPECS/$(subst -rpm,.spec,$@) || true CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc -ba rpm/SPECS/$(subst -rpm,.spec,$@
endef endef
define RPM_REBUILD_SRC define RPM_REBUILD_SRC
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc --rebuild $< || true CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc --rebuild $<
endef endef
define RPM_BUILD_COMPRESSED define RPM_BUILD_COMPRESSED
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc -ta $< || true CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc -ta $<
endef endef
### Darwin-specific ### ### Darwin-specific ###
...@@ -1123,7 +1123,7 @@ libdvdnav-rpm: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 ...@@ -1123,7 +1123,7 @@ libdvdnav-rpm: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
$(RPM_PREPARE) $(RPM_PREPARE)
cp Patches/dvdnav.patch rpm/SOURCES/ cp Patches/dvdnav.patch rpm/SOURCES/
cp libdvdnav/misc/libdvdnav.spec rpm/SPECS/ cp libdvdnav/misc/libdvdnav.spec rpm/SPECS/
sed -e 's/%define prefix \/home\/jpsaman\/Source\/vlc-0.8.6c-bugfix-m2x.git\/extras\/contrib/%define prefix \/usr/' -e 's/Copyright: GPL/License: GPL\nPatch0: dvdnav.patch/' -e 's/%setup/%setup -n libdvdnav-${LIBDVDNAV_VERSION}\n%patch -p1/' -e 's/%{name}-%{version}.tar.gz/%{name}-${LIBDVDNAV_VERSION}.tar.bz2/' -e 's/#\/dvdnav.m4/%{prefix}\/include\/dvdread\/\*\n%{prefix}\/lib\/libdvdread.\*\n%{prefix}\/share\/aclocal\/dvdnav.m4/' -i.orig rpm/SPECS/libdvdnav.spec sed -e 's/%define prefix \/home\/jpsaman\/Source\/vlc-0.8.6c-bugfix-m2x.git\/extras\/contrib/%define prefix \/usr/' -e 's/Copyright: GPL/License: GPL\nPatch0: dvdnav.patch/' -e 's/%setup/%setup -n libdvdnav-${LIBDVDNAV_VERSION}\n%patch -p1/' -e 's/%{name}-%{version}.tar.gz/%{name}-${LIBDVDNAV_VERSION}.tar.bz2/' -e 's/#\/dvdnav.m4/%{prefix}\/include\/dvdread\/\*\n%{prefix}\/lib\/libdvdread.\*\n%{prefix}\/share\/aclocal\/dvdnav.m4/' -e 's/configure/configure --enable-static --with-libdvdcss=$${RPM_BUILD_DIR}\/libdvdcss/' -i.orig rpm/SPECS/libdvdnav.spec
$(RPM_BUILD_SPEC) $(RPM_BUILD_SPEC)
touch $@ touch $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment