Author: arekm Date: Sun Mar 25 10:32:38 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 0.5.0 but there are non resolved jimtcl building problems (internal and external), so rel 0.1
---- Files affected: packages/openocd: openocd.spec (1.6 -> 1.7) , openocd-build.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/openocd/openocd.spec diff -u packages/openocd/openocd.spec:1.6 packages/openocd/openocd.spec:1.7 --- packages/openocd/openocd.spec:1.6 Wed Feb 2 16:11:04 2011 +++ packages/openocd/openocd.spec Sun Mar 25 12:32:33 2012 @@ -1,18 +1,30 @@ # $Revision$, $Date$ -# +# https://sourceforge.net/apps/trac/openocd/ticket/51 +%bcond_without libftdi # use libftdi instead of libftd2xx +%bcond_without system_jimtcl Summary: Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing Name: openocd -Version: 0.4.0 -Release: 1 +Version: 0.5.0 +Release: 0.1 License: GPL Group: Applications -Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2 -# Source0-md5: 11a81b5f200fb0c318d9f49182bb71d7 -URL: http://openocd.berlios.de/ +Source0: http://downloads.sourceforge.net/openocd/%{name}-%{version}.tar.bz2 +# Source0-md5: 43434c2b5353c9b853278b8bff22cb1a +Patch0: %{name}-build.patch +URL: http://openocd.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake +%if %{with system_jimtcl} +# http://sourceforge.net/apps/trac/openocd/ticket/50 +BuildRequires: jimtcl-devel < 0.73 +%endif +%if %{with libftdi} BuildRequires: libftdi-devel +%else +BuildRequires: libftd2xx-devel +%endif BuildRequires: libtool +BuildRequires: libusb-devel BuildRequires: texinfo BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -35,6 +47,7 @@ %prep %setup -q +%patch0 -p1 %build %{__libtoolize} @@ -44,17 +57,29 @@ %{__automake} %configure \ + --disable-werror \ + %{?with_system_jimtcl:--disable-internal-jimtcl} \ +%if %{with libftdi} + --enable-ft2232_libftdi \ + --enable-usb_blaster_libftdi \ + --enable-presto_libftdi \ +%else + CPPFLAGS="-I/usr/include/ftd2xx %{rpmcppflags}" \ + --enable-ft2232_ftd2xx \ + --enable-usb_blaster_ftd2xx \ + --enable-presto_ftd2xx \ +%endif + --enable-amtjtagaccel \ --enable-arm-jtag-ew \ --enable-at91rm9200 \ + --enable-buspirate \ --enable-dummy \ --enable-ep93xx \ - --enable-ft2232_libftdi \ --enable-gw16012 \ --enable-ioutil \ --enable-jlink \ --enable-oocd_trace \ --enable-parport \ - --enable-presto_libftdi \ --enable-rlink \ --enable-usbprog \ --enable-vsllink @@ -77,7 +102,7 @@ %{_datadir}/%{name} %{_infodir}/%{name}.info* %{_libdir}/%{name} -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -86,6 +111,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2012/03/25 10:32:33 arekm +- updated to 0.5.0 but there are non resolved jimtcl building problems (internal and external), so rel 0.1 + Revision 1.6 2011/02/02 15:11:04 sparky - do not assume compressed info files ================================================================ Index: packages/openocd/openocd-build.patch diff -u /dev/null packages/openocd/openocd-build.patch:1.1 --- /dev/null Sun Mar 25 12:32:38 2012 +++ packages/openocd/openocd-build.patch Sun Mar 25 12:32:33 2012 @@ -0,0 +1,47 @@ +diff -urN openocd-0.5.0.org/src/jtag/drivers/Makefile.am openocd-0.5.0/src/jtag/drivers/Makefile.am +--- openocd-0.5.0.org/src/jtag/drivers/Makefile.am 2011-08-09 07:34:19.000000000 +0200 ++++ openocd-0.5.0/src/jtag/drivers/Makefile.am 2012-03-25 11:23:44.876960535 +0200 +@@ -5,7 +5,8 @@ + libocdjtagdrivers_la_SOURCES = \ + $(DRIVERFILES) + +-nobase_dist_pkglib_DATA = ++pkgprgdir = $(libdir)/@PACKAGE@ ++nobase_dist_pkgprg_DATA = + + ULINK_FIRMWARE = $(srcdir)/OpenULINK + +@@ -64,7 +65,7 @@ + endif + if ULINK + DRIVERFILES += ulink.c +-nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex ++nobase_dist_pkgprg_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex + endif + if VSLLINK + DRIVERFILES += vsllink.c +diff -urN openocd-0.5.0.org/src/target/Makefile.am openocd-0.5.0/src/target/Makefile.am +--- openocd-0.5.0.org/src/target/Makefile.am 2011-08-09 07:34:19.000000000 +0200 ++++ openocd-0.5.0/src/target/Makefile.am 2012-03-25 11:23:59.447310533 +0200 +@@ -165,7 +165,8 @@ + avr32_mem.h \ + avr32_regs.h + +-nobase_dist_pkglib_DATA = +-nobase_dist_pkglib_DATA += ecos/at91eb40a.elf ++pkgprgdir = $(libdir)/@PACKAGE@ ++nobase_dist_pkgprg_DATA = ++nobase_dist_pkgprg_DATA += ecos/at91eb40a.elf + + MAINTAINERCLEANFILES = $(srcdir)/Makefile.in +--- openocd-0.5.0/jimtcl/autosetup/find-tclsh~ 2011-08-09 07:42:11.000000000 +0200 ++++ openocd-0.5.0/jimtcl/autosetup/find-tclsh 2012-03-25 11:36:36.158741432 +0200 +@@ -3,7 +3,7 @@ + # If not found, builds a bootstrap jimsh from source + d=$(dirname "$0") + PATH="$PATH:$d" +-for tclsh in jimsh tclsh8.5 tclsh8.6 jimsh0; do ++for tclsh in jimsh tclsh tclsh8.5 tclsh8.6 jimsh0; do + $tclsh "$d/test-tclsh" 2>/dev/null && exit 0 + done + echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/openocd/openocd.spec?r1=1.6&r2=1.7 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
