[arch-commits] Commit in ldc/trunk (PKGBUILD math.diff)

[Михаил Страшун]

    Date: Wednesday, June 8, 2016 @ 10:03:47
  Author: dicebot
Revision: 178187

upgpkg: ldc 1:1.0.0-1

LDC 1.0.0 release

Modified:
  ldc/trunk/PKGBUILD
Deleted:
  ldc/trunk/math.diff

-----------+
 PKGBUILD  |   12 +++----
 math.diff |   95 ------------------------------------------------------------
 2 files changed, 6 insertions(+), 101 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-08 07:54:57 UTC (rev 178186)
+++ PKGBUILD	2016-06-08 08:03:47 UTC (rev 178187)
@@ -3,7 +3,7 @@
 # Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
 pkgname=('ldc' 'liblphobos')
 groups=('dlang' 'dlang-ldc')
-pkgver=0.17.1
+pkgver=1.0.0
 epoch=1
 pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
@@ -11,14 +11,12 @@
 url="https://github.com/ldc-developers/ldc"
 license=('BSD')
 depends=('libconfig')
-makedepends=('git' 'cmake' 'llvm')
+makedepends=('git' 'cmake' 'llvm' 'dmd')
 source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}"
         "ldc2.conf"
-        "math.diff"
        )
 sha256sums=('SKIP'
             '2ef3b1090e25187305f18ce6fbbbc45527dcbb33570afbe30e177790813948db'
-            'd870ede8c9fb9e631e109da9c04ceff89596e786855132ac574adfee91b557ff'
            )
 
 build() {
@@ -25,11 +23,13 @@
     mkdir -p $srcdir/tmp_install_dir
     cd $srcdir/ldc
 
-    git apply $srcdir/math.diff
-
     git submodule update --init --recursive
 
     mkdir -p build && cd build
+
+    # workaround for wrong ld flag format generated by cmake:
+    export LDFLAGS="-L-O1 -L--sort-common -L--as-needed -L-z -Lrelro"
+
     cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \

Deleted: math.diff
===================================================================
--- math.diff	2016-06-08 07:54:57 UTC (rev 178186)
+++ math.diff	2016-06-08 08:03:47 UTC (rev 178187)
@@ -1,95 +0,0 @@
-diff --git a/dmd2/root/port.c b/dmd2/root/port.c
-index 2435400..ac23e8e 100644
---- a/dmd2/root/port.c
-+++ b/dmd2/root/port.c
-@@ -770,7 +770,7 @@ int Port::isNan(double r)
-     return isnan(r);
- #else
-     #undef isnan
--    return ::isnan(r);
-+    return std::isnan(r);
- #endif
- }
- 
-@@ -786,7 +786,7 @@ int Port::isNan(longdouble r)
-     return isnan(r);
- #else
-     #undef isnan
--    return ::isnan(r);
-+    return std::isnan(r);
- #endif
- }
- 
-@@ -814,13 +814,13 @@ int Port::isInfinity(double r)
-     return isinf(r);
- #else
-     #undef isinf
--    return ::isinf(r);
-+    return std::isinf(r);
- #endif
- }
- 
- longdouble Port::sqrt(longdouble x)
- {
--    return ::sqrtl(x);
-+    return std::sqrt(x);
- }
- 
- longdouble Port::fmodl(longdouble x, longdouble y)
-@@ -828,7 +828,7 @@ longdouble Port::fmodl(longdouble x, longdouble y)
- #if __FreeBSD__ && __FreeBSD_version < 800000 || __OpenBSD__ || __NetBSD__ || __DragonFly__
-     return ::fmod(x, y);        // hack for now, fix later
- #else
--    return ::fmodl(x, y);
-+    return std::fmod(x, y);
- #endif
- }
- 
-@@ -868,7 +868,7 @@ char *Port::strupr(char *s)
- 
-     while (*s)
-     {
--        *s = toupper(*s);
-+        *s = std::toupper(*s);
-         s++;
-     }
- 
-@@ -886,7 +886,7 @@ int Port::memicmp(const char *s1, const char *s2, int n)
-         result = c1 - c2;
-         if (result)
-         {
--            result = toupper(c1) - toupper(c2);
-+            result = std::toupper(c1) - std::toupper(c2);
-             if (result)
-                 break;
-         }
-@@ -905,7 +905,7 @@ int Port::stricmp(const char *s1, const char *s2)
-         result = c1 - c2;
-         if (result)
-         {
--            result = toupper(c1) - toupper(c2);
-+            result = std::toupper(c1) - std::toupper(c2);
-             if (result)
-                 break;
-         }
-@@ -919,17 +919,17 @@ int Port::stricmp(const char *s1, const char *s2)
- 
- float Port::strtof(const char *p, char **endp)
- {
--    return ::strtof(p, endp);
-+    return std::strtof(p, endp);
- }
- 
- double Port::strtod(const char *p, char **endp)
- {
--    return ::strtod(p, endp);
-+    return std::strtod(p, endp);
- }
- 
- longdouble Port::strtold(const char *p, char **endp)
- {
--    return ::strtold(p, endp);
-+    return std::strtold(p, endp);
- }
- 
- #endif