0
makefile에서 마지막 20 줄을 지우지 만 "Hunk # 1 FAILED at 14"가 나오는 패치를 만들려고합니다. 및 다음 거부 파일.간단한 패치에서 Hunk가 실패했습니다. 어떻게 거부 파일을 해석해야합니까?
***************
*** 14,35 ****
host_cpu = @[email protected]
- if MAC_DARWIN
- carbon = @[email protected]
- bin_SCRIPTS = $(launch_scripts)
- install: install-am
- if UniversalMacBinary
- $(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
- $(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
- lipo aouti386 aoutppc -create -output a.out
- else
- gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
-
- endif
- carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)"
- for i in $(S) ; do \
- sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \
- mv temp $(DESTDIR)$(bindir)/$$i; \
- chmod 755 $(DESTDIR)$(bindir)/$$i; \
- done
- endif
--- 14,16 ----
host_cpu = @[email protected]
어떻게 해석해야합니까? 나는 14-16 행이 일치라고 생각했을 것이다. 패치는
diff --git a/src/mac/Makefile.am b/src/mac/Makefile.am
index a612653..76d9389 100755
--- a/src/mac/Makefile.am
+++ b/src/mac/Makefile.am
@@ -14,22 +14,3 @@ EXTRA_DIST = maccmd.c njconf.h nrnneosm.h bbsconf.h macnrn.h nrnconf.h \
host_cpu = @[email protected]
-if MAC_DARWIN
-carbon = @[email protected]
-bin_SCRIPTS = $(launch_scripts)
-install: install-am
-if UniversalMacBinary
- $(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
- $(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
- lipo aouti386 aoutppc -create -output a.out
-else
- gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
-
-endif
- carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)"
- for i in $(S) ; do \
- sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \
- mv temp $(DESTDIR)$(bindir)/$$i; \
- chmod 755 $(DESTDIR)$(bindir)/$$i; \
- done
-endif