debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove OSF1 support

Browse Source
This commit is contained in:
chase
2018-05-24 14:50:03 -05:00
committed by Jon Trulson
parent 3c1736f077
commit 164e695cd0
325 changed files with 290 additions and 9980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
cde/programs/dtappbuilder/src/abmf/make_file.c
View File

@@ -101,7 +101,6 @@ static int write_os_params(
static int write_aix_stuff(File makeFile, AbmfLibs libs);
static int write_hpux_stuff(File makeFile, AbmfLibs libs);
static int write_sunos_params(File makeFile, AbmfLibs libs);
static int write_osf1_stuff(File makeFile, AbmfLibs libs);
static int write_lnx_params(File makeFile, AbmfLibs libs);
static int write_fbsd_params(File makeFile, AbmfLibs libs);
static int write_nbsd_params(File makeFile, AbmfLibs libs);
@@ -110,7 +109,6 @@ static int write_obsd_params(File makeFile, AbmfLibs libs);
static int determine_aix_libs(AbmfLibs libs, ABObj project);
static int determine_hpux_libs(AbmfLibs libs, ABObj project);
static int determine_sunos_libs(AbmfLibs libs, ABObj project);
static int determine_osf1_libs(AbmfLibs libs, ABObj project);
static int determine_lnx_libs(AbmfLibs libs, ABObj project);
static int determine_fbsd_libs(AbmfLibs libs, ABObj project);
static int determine_nbsd_libs(AbmfLibs libs, ABObj project);
@@ -226,9 +224,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType)
case AB_OS_SUNOS:
return_value = determine_sunos_libs(libs, project);
break;
case AB_OS_OSF1:
return_value = determine_osf1_libs(libs, project);
break;
case AB_OS_LNX:
return_value = determine_lnx_libs(libs, project);
break;
@@ -270,12 +265,6 @@ determine_sunos_libs(AbmfLibs libs, ABObj project)
return 0;
}
static int
determine_osf1_libs(AbmfLibs libs, ABObj project)
{
return 0;
}
static int
determine_lnx_libs(AbmfLibs libs, ABObj project)
{
@@ -495,10 +484,6 @@ write_os_params(
return_value = write_sunos_params(makeFile, libs);
break;
case AB_OS_OSF1:
return_value = write_osf1_stuff(makeFile, libs);
break;
case AB_OS_LNX:
return_value = write_lnx_params(makeFile, libs);
break;
@@ -657,50 +642,6 @@ write_sunos_params(File makeFile, AbmfLibs libs)
return 0;
}
static int
write_osf1_stuff(File makeFile, AbmfLibs libs)
{
STRING osName = util_os_type_to_string(AB_OS_OSF1);
abio_printf(makeFile,
"###########################################################################\n"
"# These are the %s-dependent configuration parameters that must be\n"
"# set in order for any application to build.\n"
"###########################################################################\n",
osName);
abio_puts(makeFile, "\n");
abio_puts(makeFile,
" RM = rm -f\n"
" INCLUDES = -I/usr/dt/include -I/X11/include\n"
"\n"
" STD_DEFINES = -DDEC\n"
" ANSI_DEFINES =\n"
"\n"
" CDEBUGFLAGS = -g\n"
" COPTFLAGS = -O2\n"
" SYS_LIBRARIES = -ldnet_stub -lm\n"
" CDE_LIBPATH = /usr/dt/lib\n"
" CDE_LDFLAGS = -L$(CDE_LIBPATH)\n"
" ALLX_LIBPATH = /X11/lib\n"
" ALLX_LDFLAGS = -L$(ALLX_LIBPATH)\n"
" EXTRA_LOAD_FLAGS = -Wl,-rpath,$(CDE_LIBPATH):$(ALLX_LIBPATH)\n"
);
write_local_libraries(makeFile, libs, AB_OS_OSF1);
abio_puts(makeFile,
"\n"
" CFLAGS = $(CDEBUGFLAGS) $(INCLUDES) $(STD_DEFINES)"
" $(ANSI_DEFINES)\n"
" LDLIBS = $(SYS_LIBRARIES)\n"
" LDOPTIONS = $(CDE_LDFLAGS) $(ALLX_LDFLAGS) $(EXTRA_LOAD_FLAGS)\n"
"\n"
);
return 0;
}
static int
write_lnx_params(File makeFile, AbmfLibs libs)
{
@@ -1219,7 +1160,7 @@ write_targets(
"scour:\n"
" $(RM) $(CLEAN_FILES) $(TARGETS.h.merged) $(TARGETS.c.merged) \\\n"
" Makefile Makefile.aix Makefile.hpux Makefile.sunos \\\n"
" Makefile.osf1 Makefile.linux \\\n"
" Makefile.linux \\\n"
" Makefile.freebsd Makefile.netbsd Makefile.openbsd\n"
);

6
cde/programs/dtappbuilder/src/abmf/stubs_c_file.c
View File

@@ -279,13 +279,13 @@ printf_setval(GenCodeInfo genCodeInfo, ABObj obj, ...)
{
int return_value = 0;
File codeFile = genCodeInfo->code_file;
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
/* OSF/1 define va_list in <va_list.h> as structure of char ** and int
#if defined(linux) || defined(CSRG_BASED)
/* Define va_list in <va_list.h> as structure of char ** and int
* Sun define va_list as void * */
va_list paramList = { 0, 0 };
#else
va_list paramList = NULL;
#endif /* __osf__ */
#endif /* linux */
STRING resName = NULL;
void *resValue = NULL;
STRING objCName = NULL;