diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-17 14:31:18 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-17 14:31:18 -0300 |
| commit | 545a4c749d49c3fddbc57c157d650b194e2193d8 (patch) | |
| tree | 7b06384a2d1d1ec07e26eda99bb0016a0540cbfc /testing/libreoffice/buildfix_64bit_system_libjpeg.diff | |
| parent | 40df5bbde7fc547479b2cede1f3ffb8e268816b3 (diff) | |
| parent | 1fcb176285908c33aca3b0f5cb703ec098e5440c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/frozen-bubble/PKGBUILD
testing/perl-sdl/PKGBUILD
Diffstat (limited to 'testing/libreoffice/buildfix_64bit_system_libjpeg.diff')
| -rw-r--r-- | testing/libreoffice/buildfix_64bit_system_libjpeg.diff | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/testing/libreoffice/buildfix_64bit_system_libjpeg.diff b/testing/libreoffice/buildfix_64bit_system_libjpeg.diff new file mode 100644 index 000000000..1f4eb110f --- /dev/null +++ b/testing/libreoffice/buildfix_64bit_system_libjpeg.diff @@ -0,0 +1,11 @@ +--- solenv/inc/libs.mk 2009-07-02 09:44:33.084467312 +0000 ++++ solenv/inc/libs.mk.new 2009-07-02 10:44:03.420819776 +0000 +@@ -211,7 +211,7 @@ + .IF "$(OS)" == "FREEBSD" + JPEG3RDLIB=/usr/local/lib/libjpeg.so + .ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64" +-JPEG3RDLIB=/usr/lib64/libjpeg.so ++JPEG3RDLIB=/usr/lib/libjpeg.so + .ELSE + JPEG3RDLIB=/usr/lib/libjpeg.so + .ENDIF |