diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-05-19 23:10:22 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-05-26 21:10:55 -0700 |
| commit | e4536bd278b07dc65a4312143d13009f52efbd81 (patch) | |
| tree | ad64f1a4beedfcfd1803df2991308fd73e07ebdd | |
| parent | b4958991accd278e61ddaf38892388410850a1f6 (diff) | |
| download | meta-openembedded-e4536bd278b07dc65a4312143d13009f52efbd81.tar.gz | |
poppler: Fix build on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler/basename-include.patch | 20 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.64.0.bb | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-oe/recipes-support/poppler/poppler/basename-include.patch new file mode 100644 index 0000000000..528528ae7c --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/basename-include.patch | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | Minic GNU basename() API for non-glibc library e.g. musl | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 5 | |||
| 6 | Index: poppler-0.64.0/utils/pdfsig.cc | ||
| 7 | =================================================================== | ||
| 8 | --- poppler-0.64.0.orig/utils/pdfsig.cc | ||
| 9 | +++ poppler-0.64.0/utils/pdfsig.cc | ||
| 10 | @@ -35,6 +35,10 @@ | ||
| 11 | #include "Win32Console.h" | ||
| 12 | #include "numberofcharacters.h" | ||
| 13 | |||
| 14 | +#if !defined(__GLIBC__) | ||
| 15 | +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) | ||
| 16 | +#endif | ||
| 17 | + | ||
| 18 | static const char * getReadableSigState(SignatureValidationStatus sig_vs) | ||
| 19 | { | ||
| 20 | switch(sig_vs) { | ||
diff --git a/meta-oe/recipes-support/poppler/poppler_0.64.0.bb b/meta-oe/recipes-support/poppler/poppler_0.64.0.bb index 1e87ae6e6c..b90f3fa359 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.64.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.64.0.bb | |||
| @@ -6,6 +6,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ | |||
| 6 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ | 6 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ |
| 7 | file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ | 7 | file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ |
| 8 | file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ | 8 | file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ |
| 9 | file://basename-include.patch \ | ||
| 9 | " | 10 | " |
| 10 | SRC_URI[md5sum] = "f7f687ebb60004f8ad61994575018044" | 11 | SRC_URI[md5sum] = "f7f687ebb60004f8ad61994575018044" |
| 11 | SRC_URI[sha256sum] = "b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1" | 12 | SRC_URI[sha256sum] = "b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1" |
