Skip to content

Commit

Permalink
LHAPDF-6.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
fd00 committed Jan 15, 2016
1 parent cf14788 commit 17bbc17
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 70 deletions.
45 changes: 0 additions & 45 deletions LHAPDF/LHAPDF-6.1.5-1bl1.src.patch

This file was deleted.

Expand Up @@ -34,7 +34,6 @@ libLHAPDF_devel_CONTENTS="
usr/include
usr/lib
"

LHAPDF_SUMMARY="${SUMMARY} (utilities)"
libLHAPDF0_SUMMARY="${SUMMARY} (runtime)"
libLHAPDF_devel_SUMMARY="${SUMMARY} (development)"
37 changes: 37 additions & 0 deletions LHAPDF/LHAPDF-6.1.6-1bl1.src.patch
@@ -0,0 +1,37 @@
diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x test-driver -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/LHAPDF-6.1.6/lhapdf.pc src/LHAPDF-6.1.6/lhapdf.pc
--- origsrc/LHAPDF-6.1.6/lhapdf.pc 2015-12-18 20:54:51.000000000 +0900
+++ src/LHAPDF-6.1.6/lhapdf.pc 2016-01-16 00:44:42.992221200 +0900
@@ -1,5 +1,5 @@
-prefix=/home/andy/heplocal
-exec_prefix=${prefix}
+prefix=/usr
+exec_prefix=/usr
libdir=${exec_prefix}/lib
includedir=${prefix}/include
datarootdir=${prefix}/share
diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x test-driver -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/LHAPDF-6.1.6/src/GridPDF.cc src/LHAPDF-6.1.6/src/GridPDF.cc
--- origsrc/LHAPDF-6.1.6/src/GridPDF.cc 2014-12-24 06:54:48.000000000 +0900
+++ src/LHAPDF-6.1.6/src/GridPDF.cc 2016-01-16 00:42:43.940762000 +0900
@@ -13,6 +13,10 @@
#include <stdexcept>
#include <cstring>

+#if defined(__CYGWIN__)
+#define strtof strtod
+#endif
+
using namespace std;

namespace LHAPDF {
diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x test-driver -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/LHAPDF-6.1.6/src/Makefile.am src/LHAPDF-6.1.6/src/Makefile.am
--- origsrc/LHAPDF-6.1.6/src/Makefile.am 2015-04-10 18:41:48.000000000 +0900
+++ src/LHAPDF-6.1.6/src/Makefile.am 2016-01-16 00:42:27.520361600 +0900
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libLHAPDF.la
noinst_LTLIBRARIES = libLHAPDFInfo.la libLHAPDFPaths.la

AM_CPPFLAGS += -I$(top_srcdir)/include -I$(prefix)/include $(BOOST_CPPFLAGS)
-AM_LDFLAGS += -L$(top_builddir)/src -L$(prefix)/lib -avoid-version
+AM_LDFLAGS += -no-undefined -L$(top_builddir)/src -L$(prefix)/lib

libLHAPDF_la_SOURCES = \
PDF.cc PDFSet.cc GridPDF.cc CompositePDF.cc PDFInfo.cc \
52 changes: 28 additions & 24 deletions LHAPDF/README
Expand Up @@ -11,46 +11,47 @@ inidivually as desired. From version 4.1 onwards a configuration script
facilitates the installation of LHAPDF.

Runtime requirements:
bash-4.1.17-9
cygwin-1.7.33-1
libgcc1-4.9.2-1
libLHAPDF-devel-6.1.5-1bl1
libLHAPDF0-6.1.5-1bl1
libstdc++6-4.9.2-1
python-2.7.8-1
bash-4.3.42-4
cygwin-2.3.1-1
libgcc1-4.9.3-1
libLHAPDF-devel-6.1.6-1bl1
libLHAPDF0-6.1.6-1bl1
libstdc++6-4.9.3-1
python-2.7.10-1

Build requirements:
(besides corresponding -devel packages)
autoconf-13-1
automake-9-1
binutils-2.25-1
binutils-2.25-4
boost.m4-0.4-1bl2
cygport-0.17.1-1
gcc-core-4.9.2-1
gcc-g++-4.9.2-1
libtool-2.4.2-5
make-4.0-2
cygport-0.20.2-1
gcc-core-4.9.3-1
gcc-fortran-4.9.3-1
gcc-g++-4.9.3-1
libtool-2.4.6-2
make-4.1-1

Canonical website:
http://lhapdf.hepforge.org/

Canonical download:
http://www.hepforge.org/archive/lhapdf/LHAPDF-6.1.5.tar.gz
http://www.hepforge.org/archive/lhapdf/LHAPDF-6.1.6.tar.gz

-------------------------------------------

Build instructions:
unpack LHAPDF-6.1.5-X-src.tar.xz
if you use setup to install this src package, it will be
unpacked under /usr/src automatically
cd /usr/src
cygport ./LHAPDF-6.1.5-X.cygport all
1. unpack LHAPDF-6.1.6-X-src.tar.xz
2. if you use setup to install this src package,
it will be unpacked under /usr/src automatically
% cd /usr/src
% cygport ./LHAPDF-6.1.6-X.cygport all

This will create:
/usr/src/LHAPDF-6.1.5-X-src.tar.xz
/usr/src/LHAPDF-6.1.5-X.tar.xz
/usr/src/libLHAPDF0-6.1.5-X.tar.xz
/usr/src/libLHAPDF-devel-6.1.5-X.tar.xz
/usr/src/LHAPDF-6.1.6-X-src.tar.xz
/usr/src/LHAPDF-6.1.6-X.tar.xz
/usr/src/libLHAPDF0-6.1.6-X.tar.xz
/usr/src/libLHAPDF-devel-6.1.6-X.tar.xz

-------------------------------------------

Expand All @@ -75,6 +76,7 @@ Files included in the binary package:
/usr/include/LHAPDF/AlphaS.h
/usr/include/LHAPDF/BicubicInterpolator.h
/usr/include/LHAPDF/BilinearInterpolator.h
/usr/include/LHAPDF/CompositePDF.h
/usr/include/LHAPDF/Config.h
/usr/include/LHAPDF/ContinuationExtrapolator.h
/usr/include/LHAPDF/ErrExtrapolator.h
Expand Down Expand Up @@ -105,6 +107,9 @@ Files included in the binary package:

Port Notes:

----- version 6.1.6-1bl1 -----
Version bump.

----- version 6.1.5-1bl1 -----
Version bump.

Expand All @@ -119,4 +124,3 @@ Version bump.

----- version 5.8.7-1bl1 -----
Initial release for Cygwin-1.7 by fd0 <http://d.hatena.ne.jp/fd0>

0 comments on commit 17bbc17

Please sign in to comment.