Skip to content

Commit

Permalink
Changed 'cp -p' to 'cp ${CP_OPTS}' to fix compilation on CSD3
Browse files Browse the repository at this point in the history
  • Loading branch information
eszter137 committed Apr 10, 2020
1 parent 1eef739 commit c1a2bad
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 14 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
#
include arch.make
#
ifeq (${CP_OPTS},)
CP_OPTS="-p"
endif
#
default: objsdir $(BUILD_TARGETS) examples_build
@if [ -z "$(BUILD_TARGETS)" ]; then echo "FoX is not configured!"; else touch .FoX; fi
#
Expand Down
2 changes: 1 addition & 1 deletion common/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ include ../arch.make
#FFLAGS=$(FFLAGS_PROFILE)
#FFLAGS=$(FFLAGS_CHECK)
#
CP=cp -p
CP=cp ${CP_OPTS}
install: $(OBJFILES)
@echo " ==> Creating $(LIBRARY) with $(OBJFILES)"
@$(AR) $(ARFLAGS_EXTRA) cru $(LIBRARY) $(OBJFILES)
Expand Down
13 changes: 7 additions & 6 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -502,13 +502,14 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
# In both cases, we have to default to `cp -p'.
# 3) On CSD3, `cp -p` fails so needed to change `cp -p` to `cp $CP_OPTS`.
# In both cases, we have to default to `cp ${CP_OPTS}'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
as_ln_s='cp ${CP_OPTS}'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
as_ln_s='cp ${CP_OPTS}'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
Expand Down Expand Up @@ -6750,13 +6751,13 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
# In both cases, we have to default to `cp -p'.
# In both cases, we have to default to `cp ${CP_OPTS}'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
as_ln_s='cp ${CP_OPTS}'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
as_ln_s='cp ${CP_OPTS}'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
Expand Down
2 changes: 1 addition & 1 deletion dom/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ m_dom_utils.f90: m_dom_utils.m4
m_dom_dom.F90: $(M4FILES)
m4 -I ../m4 m_dom_dom.m4 > $@
#
CP=cp -p
CP=cp ${CP_OPTS}
install: $(OBJFILES)
@echo " ==> Creating $(LIBRARY) with $(OBJFILES)"
$(AR) $(ARFLAGS_EXTRA) cru $(LIBRARY) $(OBJFILES)
Expand Down
2 changes: 1 addition & 1 deletion fsys/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ INCFLAGS=
#
include ../arch.make
#
CP=cp -p
CP=cp ${CP_OPTS}
install: $(OBJFILES)
@echo " ==> Creating $(LIBRARY) with $(OBJFILES)"
@$(AR) $(ARFLAGS_EXTRA) cru $(LIBRARY) $(OBJFILES)
Expand Down
2 changes: 1 addition & 1 deletion sax/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ INCFLAGS=$(MOD_PREFIX)../objs/finclude
#
include ../arch.make
#
CP=cp -p
CP=cp ${CP_OPTS}
install: $(OBJFILES)
@echo " ==> Creating $(LIBRARY) with $(OBJFILES)"
@$(AR) $(ARFLAGS_EXTRA) cru $(LIBRARY) $(OBJFILES)
Expand Down
2 changes: 1 addition & 1 deletion utils/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ INCFLAGS=$(MOD_PREFIX)../objs/finclude
#
include ../arch.make
#
CP=cp -p
CP=cp ${CP_OPTS}
install: $(OBJFILES)
@echo " ==> Creating $(LIBRARY) with $(OBJFILES)"
@$(AR) $(ARFLAGS_EXTRA) cru $(LIBRARY) $(OBJFILES)
Expand Down
2 changes: 1 addition & 1 deletion wcml/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ INCFLAGS=$(MOD_PREFIX)../objs/finclude
#
include ../arch.make
#
CP=cp -p
CP=cp ${CP_OPTS}
install: $(OBJFILES)
@echo " ==> Creating $(LIBRARY) with $(OBJFILES)"
@$(AR) $(ARFLAGS_EXTRA) cru $(LIBRARY) $(OBJFILES)
Expand Down
2 changes: 1 addition & 1 deletion wkml/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include ../arch.make
#FFLAGS=$(FFLAGS_PROFILE)
#FFLAGS=$(FFLAGS_CHECK)
#
CP=cp -p
CP=cp ${CP_OPTS}
install: $(OBJFILES)
@echo " ==> Updating $(LIBRARY) with $(OBJFILES)"
@$(AR) $(ARFLAGS_EXTRA) cru $(LIBRARY) $(OBJFILES)
Expand Down
2 changes: 1 addition & 1 deletion wxml/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ INCFLAGS=$(MOD_PREFIX)../objs/finclude
#
include ../arch.make
#
CP=cp -p
CP=cp ${CP_OPTS}
install: $(OBJFILES)
@echo "==> Creating $(LIBRARY) with $(OBJFILES)"
$(AR) $(ARFLAGS_EXTRA) cru $(LIBRARY) $(OBJFILES)
Expand Down

0 comments on commit c1a2bad

Please sign in to comment.