Custom Query (541 matches)

Filters
 
Or
 
  
 
Columns

Show under each result:


Results (22 - 24 of 541)

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
Ticket Resolution Summary Owner Reporter
#147 fixed Many makefiles hard code cc somebody baker
Description

Many makefiles hard code cc for the C compiler, either as:

CC=cc

or as:

target:
	cc $(CFLAGS) etc.

cc may not exist, or may not be the same compiler selected by ew_*.sh. The fixes are:

  • libsrc/qlib2/Makefile
#CC	= cc
  • archiving/archman/makefile.ux
archman: $(OBJ)
	(echo ------; cd lib; echo Making lib in:; pwd; \
	        make -f makefile.ux);
	$(CC) ${GLOBALFLAGS} -o $(B)/archman $(OBJ) $(LIBBGS) -lpthread -lm
  • seismic_processing/hyp71_mgr/makefile.ux
hyp71_mgr: $(C_OBJ)
	$(CC) $(CFLAGS) -o $B/hyp71_mgr $(C_OBJ) -lm -mt -lpthread
  • seismic_processing/raypicker/makefile.ux
#cc = cc
#link = cc
$(APP): $(APP_OBJECTS)
	echo "making the main app"
	echo "have $(APP_OBJECTS)"
	$(CC) $(CFLAGS) $(APP_OBJECTS) $(ALL_CLIENT_LIBS) $(LIBS) -o $(APP)
	cp $(APP) $(B)
.c.$(OBJ):
	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
#148 fixed Fixes for new raypicker kevin baker
Description

The new raypicker code Stefan added does not compile on Linux or Mac OS X. This is because it has Windows-specific code. I modified the following files to eliminate or conditionalize the Windows-only code so that raypicker compiles without errors or warnings on Linux and Mac OS X.

  • In the main program, seismic_processing/raypicker/raypicker.c, the mutex variables are declared HANDLE. The fix is to change the declaration to mutex_t. Also, as previously noted, #include <malloc.h> is unnecessary, and does not exist on Mac OS X:
/* #include <malloc.h> */
mutex_t	hStackerMutex;
mutex_t	hProcessorMutex;
  • In seismic_processing/raypicker/rp_messaging.c, #include <string.h> is missing, and the code is Windows-specific. The fix is:
#include <stdio.h>
#include <string.h>
#include <float.h>  /* DBL_MAX */
#ifdef _WINNT
  _snprintf_s( msg, sizeof(msg), _TRUNCATE, "%ld %hd %s\n\0", t, 0, szError);
#else
  snprintf( msg, sizeof(msg), "%ld %hd %s\n\0", t, 0, szError);
#endif
  • In seismic_processing/raypicker/stalist.c, #include <string.h> is missing (and #include <malloc.h> should be removed), and the code is Windows-specific. The fix is:
#include <stdlib.h>
/* #include <malloc.h> */
#include <string.h>
#ifdef _WINNT
            memcpy_s(&(pNewSCNL[i]), sizeof(RaypickerSCNL), thisSCNL, sizeof(RaypickerSCNL));
#else
            memcpy(&(pNewSCNL[i]), thisSCNL, sizeof(RaypickerSCNL));
#endif
  • In seismic_processing/raypicker/stalist_parse.c, #include <string.h> is missing (and #include <malloc.h> should be removed), and the code is Windows-specific. The fix is:
#include <earthworm.h>
#ifndef _WINNT
#include <errno.h>
#endif

, two instances of:

#ifdef _WINNT
    err = fopen_s(&pFile, szFile, "r");
#else
    pFile = fopen(szFile, "r");
    err = errno;
#endif

and:

#ifdef _WINNT
        if (sscanf_s(&(szLine[4]), " %s %s %s %s", pSCNL[*pNumSCNL].sta, sizeof(pSCNL[*pNumSCNL].sta),
                    pSCNL[*pNumSCNL].comp, sizeof(pSCNL[*pNumSCNL].comp),
                    pSCNL[*pNumSCNL].net, sizeof(pSCNL[*pNumSCNL].net),
                    pSCNL[*pNumSCNL].loc, sizeof(pSCNL[*pNumSCNL].loc)) < 4)
#else
        if (sscanf(&(szLine[4]), " %s %s %s %s", pSCNL[*pNumSCNL].sta,
                  pSCNL[*pNumSCNL].comp,
                  pSCNL[*pNumSCNL].net,
                  pSCNL[*pNumSCNL].loc) < 4)
#endif

As previously noted, Mac OS X does not have a malloc.h. The fix is to remove #include <malloc.h> from the following files:

  • seismic_processing/raypicker/config.c
  • seismic_processing/raypicker/pick_channel_info.c
  • seismic_processing/raypicker/pick_series.c
  • seismic_processing/raypicker/pre_filter.c
  • seismic_processing/raypicker/rate_constants.c

Linux complains about missing newlines at the end of several include files. The fix is to add a newline to the end of the following files:

  • seismic_processing/raypicker/compare.h
  • seismic_processing/raypicker/config.h
  • seismic_processing/raypicker/pick_channel_info.h
  • seismic_processing/raypicker/symmetry
  • seismic_processing/raypicker/tracebuf2double.h
#149 fixed make clean_unix, make clean_bin_unix do not remove nmxptool/Makefile's somebody baker
Description

make clean_unix and make clean_bin_unix do not remove the following Makefile's:

src/data_sources/nmxptool/lib/Makefile
src/data_sources/nmxptool/Makefile
src/data_sources/nmxptool/src/Makefile

When I copy a tarball of the Earthworm 7.5 trunk from one machine to another, then do the clean steps, these Makefile's are still there. The CC and CPP definitions in these Makefile's are not correct on the new machine, which causes make unix to fail with the error that it can't find the gcc compiler.

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
Note: See TracQuery for help on using queries.