summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO2
-rw-r--r--0001-Revert-Drop-install-target-and-documentation.patch17
-rw-r--r--PKGBUILD2
3 files changed, 7 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5ddaf0c24bcf..77c72244bb1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,7 @@ pkgbase = libopencm3-git
source = git://github.com/libopencm3/libopencm3.git
source = 0001-Revert-Drop-install-target-and-documentation.patch
sha256sums = SKIP
- sha256sums = 73d9a5f007e7e61a71b28dedb41fdfe88e976c1aa2c728f34bd0b5049b6d30fe
+ sha256sums = 457dc2d2810e2b7ac857952021f5092a0de923069645f50f9c95a09c86b52158
pkgname = libopencm3-git
diff --git a/0001-Revert-Drop-install-target-and-documentation.patch b/0001-Revert-Drop-install-target-and-documentation.patch
index 2dbcfe52b072..6d4f01e3a586 100644
--- a/0001-Revert-Drop-install-target-and-documentation.patch
+++ b/0001-Revert-Drop-install-target-and-documentation.patch
@@ -1,13 +1,5 @@
-commit 877200d30e2f044a5c6df47e37cf7adb01fdefd6
-Author: Anatol Pomozov <anatol.pomozov@gmail.com>
-Date: Sun Jan 10 18:58:44 2016 -0800
-
- Revert "Drop "install" target and documentation."
-
- This reverts commit 7c1cd2e5cd3f3d1193ee375b46cfd8afaccb89f7.
-
diff --git a/Makefile b/Makefile
-index 6929769d..2ae85c23 100644
+index 6929769d..ca06efd7 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,13 @@ PREFIX ?= arm-none-eabi
@@ -24,7 +16,7 @@ index 6929769d..2ae85c23 100644
space:=
space+=
SRCLIBDIR:= $(subst $(space),\$(space),$(realpath lib))
-@@ -70,6 +77,21 @@ $(LIB_DIRS): $(IRQ_DEFN_FILES:=.genhdr)
+@@ -70,6 +77,22 @@ $(LIB_DIRS): $(IRQ_DEFN_FILES:=.genhdr)
lib: $(LIB_DIRS)
$(Q)true
@@ -40,13 +32,14 @@ index 6929769d..2ae85c23 100644
+ $(Q)$(INSTALL) -m 0644 lib/*.a $(LIBDIR)
+ @printf " INSTALL ldscripts\n"
+ $(Q)$(INSTALL) -m 0644 lib/*.ld $(LIBDIR)
-+ $(Q)$(INSTALL) -m 0644 lib/efm32/*/*.ld $(LIBDIR)
++ $(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR)
++ $(Q)$(INSTALL) -m 0644 lib/*/*/*.ld $(LIBDIR)
+
+
html doc:
$(Q)$(MAKE) -C doc html
-@@ -114,4 +136,4 @@ genlinktests.clean:
+@@ -114,4 +137,4 @@ genlinktests.clean:
fi;
diff --git a/PKGBUILD b/PKGBUILD
index 684cb6b43c38..fb5c3cbb646c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ options=(!strip staticlibs !buildflags)
source=(git://github.com/libopencm3/libopencm3.git
0001-Revert-Drop-install-target-and-documentation.patch)
sha256sums=('SKIP'
- '73d9a5f007e7e61a71b28dedb41fdfe88e976c1aa2c728f34bd0b5049b6d30fe')
+ '457dc2d2810e2b7ac857952021f5092a0de923069645f50f9c95a09c86b52158')
pkgver() {
cd libopencm3