[pkgsrc/trunk]: pkgsrc/lang/ossp-js Re-factor fdlibm stuff so that it gets de...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/ossp-js Re-factor fdlibm stuff so that it gets de...
From: bjs <bjs%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:46:05 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c3525cb0217b
branches:  trunk
changeset: 538354:c3525cb0217b
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Feb 06 10:08:01 2008 +0000

description:
Re-factor fdlibm stuff so that it gets defined as appropriate during
a build.  Bump rev.

diffstat:

 lang/ossp-js/Makefile         |  23 +++++------------------
 lang/ossp-js/buildlink3.mk    |   8 ++++----
 lang/ossp-js/distinfo         |   4 ++--
 lang/ossp-js/libm.mk          |  23 +++++++++++++++++++++++
 lang/ossp-js/patches/patch-aa |   4 ++--
 lang/ossp-js/patches/patch-ab |   4 ++--
 6 files changed, 38 insertions(+), 28 deletions(-)

diffs (146 lines):

diff -r 047f2f59a03d -r c3525cb0217b lang/ossp-js/Makefile
--- a/lang/ossp-js/Makefile     Wed Feb 06 09:34:09 2008 +0000
+++ b/lang/ossp-js/Makefile     Wed Feb 06 10:08:01 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2008/02/06 10:08:01 bjs Exp $
 #
 
 DISTNAME=      js-1.6.20070208
 PKGNAME=       ossp-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ftp://ftp.ossp.org/pkg/lib/js/
 
@@ -37,26 +38,12 @@
 REPLACE.js.new=        ${PREFIX}/bin/js
 REPLACE_FILES.js=      jslint.js jspack.js
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(PKG_DEVELOPER)
-CPPFLAGS+=     -Wall
-.endif
+.include "libm.mk"
 
-###
-### XXX I took this from jslibmath.h.  If this is not correct, please feel
-###    free to change it.  Our lang/spidermonkey package never uses
-###    the Sun math library, and I'm not sure if this is correct.
-###
-JS_FDLIBM_PLATFORMS=   Linux-*-* IRIX-*-* SunOS-*-* \
-                       Solaris-*-* AIX-*-* HPUX-*-*
-
-.if !empty(JS_FDLIBM_PLATFORMS:M${MACHINE_PLATFORM})
-CPPFLAGS+=             -DPKG_FDLIBM_MATH_REQUESTED=1
-MAKE_ENV+=             -DPKG_FDLIBM_MATH_REQUESTED=1
+.if !empty(JS_FDLIBM_MATH_REQUESTED:M[Yy][Ee][Ss])
+MAKE_ENV+=             -DJS_FDLIBM_MATH_REQUESTED=1
 CONFIGURE_ENV+=                LIBM=""
 .else
-CPPFLAGS+=             -DPKG_FDLIBM_MATH_REQUESTED=0
 CONFIGURE_ENV+=                LIBM="-lm"
 .endif
 
diff -r 047f2f59a03d -r c3525cb0217b lang/ossp-js/buildlink3.mk
--- a/lang/ossp-js/buildlink3.mk        Wed Feb 06 09:34:09 2008 +0000
+++ b/lang/ossp-js/buildlink3.mk        Wed Feb 06 10:08:01 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/02/06 10:08:01 bjs Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 OSSP_JS_BUILDLINK3_MK:=        ${OSSP_JS_BUILDLINK3_MK}+
@@ -12,11 +12,11 @@
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ossp-js
 
 .if ${OSSP_JS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.ossp-js+=        ossp-js>=1.6.20070208
+BUILDLINK_API_DEPENDS.ossp-js+=        ossp-js>=1.6.20070208nb1
 BUILDLINK_PKGSRCDIR.ossp-js?=  ../../lang/ossp-js
+.  include "../../lang/ossp-js/libm.mk"
 .endif # OSSP_JS_BUILDLINK3_MK
 
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/dlopen/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 047f2f59a03d -r c3525cb0217b lang/ossp-js/distinfo
--- a/lang/ossp-js/distinfo     Wed Feb 06 09:34:09 2008 +0000
+++ b/lang/ossp-js/distinfo     Wed Feb 06 10:08:01 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+$NetBSD: distinfo,v 1.2 2008/02/06 10:08:01 bjs Exp $
 
 SHA1 (js-1.6.20070208.tar.gz) = 3c8c4b81637b84fa344334a2c0bb093244620d9e
 RMD160 (js-1.6.20070208.tar.gz) = e2e5a1f50026d50caae672bf1122f728991ca377
 Size (js-1.6.20070208.tar.gz) = 1109930 bytes
-SHA1 (patch-aa) = 850e025755cd2f5099a0779b54d9ba1d76fb938b
+SHA1 (patch-aa) = 92a1f440ea8f2686216ad4b2f04cc8ef502eae02
 SHA1 (patch-ab) = f7e8d00401df8c7f86f2b3c2c342d3869562fe4a
 SHA1 (patch-ac) = cfb32539e82762755090c90fd22978d541edb1d7
 SHA1 (patch-ad) = 9cee1435756bd1d6dec029d81444ec45418a4b18
diff -r 047f2f59a03d -r c3525cb0217b lang/ossp-js/libm.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ossp-js/libm.mk      Wed Feb 06 10:08:01 2008 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: libm.mk,v 1.1 2008/02/06 10:08:01 bjs Exp $
+#
+# XXX I took this from jslibmath.h.  If this is not correct, please feel
+#      free to change it.  Our lang/spidermonkey package never uses
+#      the Sun math library, and I'm not sure if this is correct.
+#
+.include "../../mk/bsd.fast.prefs.mk"
+
+JS_FDLIBM_PLATFORMS=   Linux-*-* IRIX-*-* SunOS-*-* \
+                       Solaris-*-* AIX-*-* HPUX-*-*
+
+JS_FDLIBM_MATH_REQUESTED?=     no
+.for plat in ${JS_FDLIBM_PLATFORMS}
+.  if !empty(MACHINE_PLATFORM:M${plat})
+JS_FDLIBM_MATH_REQUESTED=      yes
+.  endif
+.endfor
+
+.if !empty(JS_FDLIBM_MATH_REQUESTED:M[Yy][Ee][Ss])
+CPPFLAGS+=     -DJS_FDLIBM_MATH_REQUESTED=1
+.else
+CPPFLAGS+=     -DJS_FDLIBM_MATH_REQUESTED=0
+.endif
diff -r 047f2f59a03d -r c3525cb0217b lang/ossp-js/patches/patch-aa
--- a/lang/ossp-js/patches/patch-aa     Wed Feb 06 09:34:09 2008 +0000
+++ b/lang/ossp-js/patches/patch-aa     Wed Feb 06 10:08:01 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2008/02/06 10:08:02 bjs Exp $
 
 --- src/jslibmath.h.orig       2006-07-23 08:22:18.000000000 -0400
 +++ src/jslibmath.h
@@ -11,7 +11,7 @@
 -#else
 -#define JS_USE_FDLIBM_MATH 1
 -#endif
-+#define JS_USE_FDLIBM_MATH PKG_JS_FDLIBM_REQUESTED
++#define JS_USE_FDLIBM_MATH JS_FDLIBM_MATH_REQUESTED
  #endif
  
  #if !JS_USE_FDLIBM_MATH
diff -r 047f2f59a03d -r c3525cb0217b lang/ossp-js/patches/patch-ab
--- a/lang/ossp-js/patches/patch-ab     Wed Feb 06 09:34:09 2008 +0000
+++ b/lang/ossp-js/patches/patch-ab     Wed Feb 06 10:08:01 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/02/06 04:22:33 bjs Exp $
+$NetBSD: patch-ab,v 1.2 2008/02/06 10:08:02 bjs Exp $
 
 --- Makefile.in.orig   2007-02-08 04:25:33.000000000 -0500
 +++ Makefile.in
@@ -9,7 +9,7 @@
 -               src/jsdso.lo                \
 -               src/fdlibm/e_acos.lo        \
 +               src/jsdso.lo                
-+.if defined(PKG_FDLIBM_MATH_REQUESTED)
++.if defined(JS_FDLIBM_MATH_REQUESTED)
 +LIB_OBJS+=     src/fdlibm/e_acos.lo        \
                 src/fdlibm/e_asin.lo        \
                 src/fdlibm/e_atan2.lo       \

Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/boost-build Added support for installationt to D...
Next by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat libnbcompat-20080212:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/boost-build Added support for installationt to D...
Next by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat libnbcompat-20080212:
Indexes:

Home | Main Index | Thread Index | Old Index