diff options
| author | L.G. Sarmiento | 2017-09-05 10:16:28 +0200 |
|---|---|---|
| committer | L.G. Sarmiento | 2017-09-05 10:16:28 +0200 |
| commit | 776ab9547d3f7163aa892625115a4f3acec5a600 (patch) | |
| tree | 3fb2c8c0ac1002d510e27533485e42d20ae12273 | |
| parent | 793fd8d5f04232607c1b081bdc92baf21c62e8ce (diff) | |
| download | aur-776ab9547d3f7163aa892625115a4f3acec5a600.tar.gz | |
fPIC fixed
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | gfortran_i686.patch | 6 | ||||
| -rw-r--r-- | gfortran_x86_64.patch | 2 | ||||
| -rw-r--r-- | upak.install | 4 |
5 files changed, 16 insertions, 14 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Tue Sep 5 08:16:14 UTC 2017 pkgbase = upak pkgdesc = HRIBF Data Acquisition and analysis. pkgver = 10.6.8 - pkgrel = 6 + pkgrel = 7 url = ftp://ftp.phy.ornl.gov/pub/upak/README.html install = upak.install arch = i686 @@ -18,9 +20,9 @@ pkgbase = upak source = gfortran_i686.patch source = upak.install md5sums = c167fd178279d88e05320c7e580b05b4 - md5sums = 80de296d49c4cf91aac4678536c7bd7f - md5sums = 2989e31a42d8922c0f05c22eb7f4a8be - md5sums = 1f5d22a84125d8cbcc6ee2fdfe73ffd4 + md5sums = cb904633d49f17c707515646c2bd2338 + md5sums = d1accbca0c14b8499870577b3e2fe05f + md5sums = f30a0ff9efb503779618680ad6a2da0e pkgname = upak @@ -2,7 +2,7 @@ pkgname=upak pkgver=10.6.8 -pkgrel=6 +pkgrel=7 pkgdesc="HRIBF Data Acquisition and analysis." url="ftp://ftp.phy.ornl.gov/pub/upak/README.html" arch=('i686' 'x86_64') @@ -15,9 +15,9 @@ source=("ftp://ftp.phy.ornl.gov/pub/${pkgname}/${pkgname}-src.tgz" "gfortran_i686.patch" "upak.install") md5sums=('c167fd178279d88e05320c7e580b05b4' - '80de296d49c4cf91aac4678536c7bd7f' - '2989e31a42d8922c0f05c22eb7f4a8be' - '1f5d22a84125d8cbcc6ee2fdfe73ffd4') + 'cb904633d49f17c707515646c2bd2338' + 'd1accbca0c14b8499870577b3e2fe05f' + 'f30a0ff9efb503779618680ad6a2da0e') install="${pkgname}.install" prepare() { diff --git a/gfortran_i686.patch b/gfortran_i686.patch index bbd3d05262d5..17e29dd66bcf 100644 --- a/gfortran_i686.patch +++ b/gfortran_i686.patch @@ -34,14 +34,14 @@ +#export FLIBS= -L/sw/lib -lgfortran -lgcc +#export INSTALLDIR= ../../hhirf +# -+#--Gfortran - must be gcc >=4.2 ++#--Gfortran - must be gcc >=4.2 +# LINUX version +export F77= gfortran +export CC=gcc -+export OPT= -O ++export OPT= -O -fPIC +export FARGS= $(FENDIAN) -DGFORTRAN -fno-automatic -fsecond-underscore -fno-range-check +export CARGS= $(FENDIAN) +export FLIBS= -lgfortran -lgcc #export INSTALLDIR= /usr/hhirf # - #--G77 + #--G77 diff --git a/gfortran_x86_64.patch b/gfortran_x86_64.patch index 61fb8b0af6fd..c4f9eedfbcd3 100644 --- a/gfortran_x86_64.patch +++ b/gfortran_x86_64.patch @@ -29,7 +29,7 @@ +# LINUX version +export F77= gfortran +export CC=gcc -+export OPT= -O ++export OPT= -O -fPIC +export FARGS= $(FENDIAN) -DGFORTRAN -fno-automatic -fsecond-underscore -fno-range-check +export CARGS= $(FENDIAN) +export FLIBS= -lgfortran -lgcc diff --git a/upak.install b/upak.install index f8f336ad8999..dfe818bae444 100644 --- a/upak.install +++ b/upak.install @@ -14,11 +14,11 @@ _help_warning() { cat <<EOF >>> NOTE: Remember to set properly your help path. By default upak is expecting the >>> help to be located in /usr/hhirf/damm.hep or to be pointed out in explicitly ->>> in the file: ${HOME}/upak_help_path. +>>> in the file: \${HOME}/upak_help_path. >>> >>> You can set your help path by typing in a terminal the following: >>> ->>> echo "/usr/share/doc/upak/" > ${HOME}/upak_help_path +>>> echo "/usr/share/doc/upak/" > \${HOME}/upak_help_path >>> EOF } |