misc/shared_lib_patch_incomplete.diff

   1 Index: wodim/CMakeLists.txt
   2 ===================================================================
   3 --- wodim/CMakeLists.txt        (Revision 579)
   4 +++ wodim/CMakeLists.txt        (Arbeitskopie)
   5 @@ -21,7 +21,17 @@
   6
   7  ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE)
   8
   9 -ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
  10 +SET(CDRECORD_SRCS wodim.c audiosize.c auinfo.c  cdr_drv.c cdtext.c clone.c crc16.c cue.c  diskid.c drv_7501.c drv_jvc.c drv_mmc.c drv_philips.c drv_simul.c drv_sony.c fifo.c  isosize.c scsi_cdr_mmc4.c scsi_mmc4.c sector.c subchan.c wm_packet.c wm_session.c wm_track.c xio.c)
  11 +SET(CDRECORD_COMMON_SRCS cd_misc.c defaults.c getnum.c misc.c modes.c movesect.c scsi_cdr.c scsi_mmc.c scsi_scan.c)
  12 +
  13 +IF(SHLIB_STYLE)
  14 +   ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
  15 +   ADD_LIBRARY (wodimstuff SHARED ${CDRECORD_COMMON_SRCS})
  16 +   LIST(APPEND EXTRA_LIBS wodimstuff)
  17 +ELSE(SHLIB_STYLE)
  18 +   ADD_EXECUTABLE (wodim ${CDRECORD_SRCS} ${CDRECORD_COMMON_SRCS})
  19 +ENDIF(SHLIB_STYLE)
  20 +
  21  TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc)
  22  SET_TARGET_PROPERTIES(wodim PROPERTIES SKIP_BUILD_RPATH TRUE)
  23
  24 Index: genisoimage/CMakeLists.txt
  25 ===================================================================
  26 --- genisoimage/CMakeLists.txt  (Revision 579)
  27 +++ genisoimage/CMakeLists.txt  (Arbeitskopie)
  28 @@ -27,6 +27,13 @@
  29
  30  SET(MKISOFS_MOST_SRCS apple.c boot.c cd_misc.c defaults.c desktop.c dvd_file.c dvd_reader.c eltorito.c exclude.c files.c fnmatch.c getnum.c hash.c ifo_read.c joliet.c mac_label.c match.c modes.c multi.c name.c rock.c scsi.c scsi_cdr.c stream.c tree.c udf.c vms.c volume.c write.c boot-alpha.c boot-hppa.c boot-mips.c md5.c jte.c rsync.c
  31         boot-mipsel.c endian.c )
  32 +
  33 +IF(SHLIB_STYLE)
  34 +   SET(MKISOFS_MOST_SRCS apple.c boot.c cd_misc.c defaults.c desktop.c dvd_file.c dvd_reader.c eltorito.c exclude.c files.c fnmatch.c getnum.c hash.c ifo_read.c joliet.c mac_label.c match.c modes.c multi.c name.c rock.c scsi.c scsi_cdr.c stream.c tree.c udf.c vms.c volume.c write.c boot-alpha.c boot-hppa.c boot-mips.c md5.c jte.c rsync.c
  35 +      boot-mipsel.c endian.c )
  36 +   LIST ( APPEND EXTRA_LIBS  wodimstuff )
  37 +   message(FATAL_ERROR "fixme, half done, see experimental branch, needs to change other tools to libwodimstuff, etc.")
  38 +ENDIF(SHLIB_STYLE)
  39
  40  INCLUDE(CheckFunctionExists)
  41  SET(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
  42 @@ -37,7 +44,7 @@
  43
  44
  45  #SET_SOURCE_FILES_PROPERTIES(${MKISOFS_MOST_SRCS} PROPERTIES )
  46 -LINK_DIRECTORIES(../libhfs_iso ../librols ../libusal ../libunls ../libdeflt)
  47 +LINK_DIRECTORIES(../libhfs_iso ../librols ../libusal ../libunls ../libdeflt ../wodim)
  48
  49  ADD_EXECUTABLE (genisoimage genisoimage.c ${MKISOFS_MOST_SRCS})
  50  TARGET_LINK_LIBRARIES(genisoimage hfs_iso deflt ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${EXTRA_LIBS})
  51 Index: libusal/CMakeLists.txt
  52 ===================================================================
  53 --- libusal/CMakeLists.txt      (Revision 579)
  54 +++ libusal/CMakeLists.txt      (Arbeitskopie)
  55 @@ -6,5 +6,9 @@
  56  #SET(LIBSCG_SRCS rdummy.c usalsettarget.c usaltimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
  57  SET(LIBSCG_SRCS usalsettarget.c usaltimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c)
  58  LINK_DIRECTORIES(../librols)
  59 +IF(SHLIB_STYLE)
  60 +ADD_LIBRARY (usal SHARED ${LIBSCG_SRCS})
  61 +ELSE(SHLIB_STYLE)
  62  ADD_LIBRARY (usal STATIC ${LIBSCG_SRCS})
  63 +ENDIF(SHLIB_STYLE)
  64  TARGET_LINK_LIBRARIES(usal ${SCG_SELF_LIBS})
  65 Index: misc/shared_lib_patch_incomplete.diff
  66 ===================================================================
  67 --- misc/shared_lib_patch_incomplete.diff       (Revision 579)
  68 +++ misc/shared_lib_patch_incomplete.diff       (Arbeitskopie)
  69 @@ -1,31 +1,29 @@
  70  Index: wodim/CMakeLists.txt
  71  ===================================================================
  72 ---- wodim/CMakeLists.txt       (Revision 556)
  73 +--- wodim/CMakeLists.txt       (Revision 579)
  74  +++ wodim/CMakeLists.txt       (Arbeitskopie)
  75 -@@ -21,8 +21,18 @@
  76 +@@ -21,7 +21,17 @@
  77
  78   ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE)
  79
  80  -ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
  81 --TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc)
  82 ++SET(CDRECORD_SRCS wodim.c audiosize.c auinfo.c  cdr_drv.c cdtext.c clone.c crc16.c cue.c  diskid.c drv_7501.c drv_jvc.c drv_mmc.c drv_philips.c drv_simul.c drv_sony.c fifo.c  isosize.c scsi_cdr_mmc4.c scsi_mmc4.c sector.c subchan.c wm_packet.c wm_session.c wm_track.c xio.c)
  83 ++SET(CDRECORD_COMMON_SRCS cd_misc.c defaults.c getnum.c misc.c modes.c movesect.c scsi_cdr.c scsi_mmc.c scsi_scan.c)
  84  +
  85  +IF(SHLIB_STYLE)
  86 -+   SET(CDRECORD_SRCS wodim.c audiosize.c auinfo.c  cdr_drv.c cdtext.c clone.c crc16.c cue.c  diskid.c drv_7501.c drv_jvc.c drv_mmc.c drv_philips.c drv_simul.c drv_sony.c fifo.c  isosize.c scsi_cdr_mmc4.c scsi_mmc4.c sector.c subchan.c wm_packet.c wm_session.c wm_track.c xio.c)
  87 -+   SET(CDRECORD_COMMON_SRCS cd_misc.c defaults.c getnum.c misc.c modes.c movesect.c scsi_cdr.c scsi_mmc.c scsi_scan.c)
  88  +   ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
  89  +   ADD_LIBRARY (wodimstuff SHARED ${CDRECORD_COMMON_SRCS})
  90 -+   TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc wodimstuff)
  91 ++   LIST(APPEND EXTRA_LIBS wodimstuff)
  92  +ELSE(SHLIB_STYLE)
  93 -+   ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
  94 -+   TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc)
  95 ++   ADD_EXECUTABLE (wodim ${CDRECORD_SRCS} ${CDRECORD_COMMON_SRCS})
  96  +ENDIF(SHLIB_STYLE)
  97  +
  98 + TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc)
  99   SET_TARGET_PROPERTIES(wodim PROPERTIES SKIP_BUILD_RPATH TRUE)
 100
 101 - INSTALL(TARGETS wodim DESTINATION bin)
 102  Index: genisoimage/CMakeLists.txt
 103  ===================================================================
 104 ---- genisoimage/CMakeLists.txt (Revision 556)
 105 +--- genisoimage/CMakeLists.txt (Revision 579)
 106  +++ genisoimage/CMakeLists.txt (Arbeitskopie)
 107  @@ -27,6 +27,13 @@
 108
 109 @@ -52,7 +50,7 @@
 110   TARGET_LINK_LIBRARIES(genisoimage hfs_iso deflt ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${EXTRA_LIBS})
 111  Index: libusal/CMakeLists.txt
 112  ===================================================================
 113 ---- libusal/CMakeLists.txt     (Revision 556)
 114 +--- libusal/CMakeLists.txt     (Revision 579)
 115  +++ libusal/CMakeLists.txt     (Arbeitskopie)
 116  @@ -6,5 +6,9 @@
 117   #SET(LIBSCG_SRCS rdummy.c usalsettarget.c usaltimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
 118 @@ -64,20 +62,3 @@
 119   ADD_LIBRARY (usal STATIC ${LIBSCG_SRCS})
 120  +ENDIF(SHLIB_STYLE)
 121   TARGET_LINK_LIBRARIES(usal ${SCG_SELF_LIBS})
 122 -Index: librols/CMakeLists.txt
 123 -===================================================================
 124 ---- librols/CMakeLists.txt     (Revision 556)
 125 -+++ librols/CMakeLists.txt     (Arbeitskopie)
 126 -@@ -1,7 +1,11 @@
 127 - PROJECT (LIBROLS)
 128 - INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim)
 129 -
 130 --SET(LIBROLS_SRCS  astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fcons64.c stdio/fdown.c stdio/fdup.c stdio/fdup64.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/fileluopen64.c stdio/filemopen.c stdio/filemopen64.c stdio/fileopen.c stdio/fileopen64.c stdio/filepos.c stdio/filepos64.c stdio/fileread.c stdio/filereopen.c stdio/filereopen64.c stdio/fileseek.c stdio/fileseek64.c stdio/filesize.c stdio/filesize64.c stdio/filestat.c stdio/filestat64.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/openfd64.c stdio/peekc.c )
 131 -+SET(LIBROLS_SRCS  astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fdown.c stdio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileopen.c stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c stdio/filesize.c stdio/filestat.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/peekc.c )
 132 -
 133 -+IF(SHLIB_STYLE)
 134 -+ADD_LIBRARY (rols SHARED ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h  ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS})
 135 -+ELSE(SHLIB_STYLE)
 136 - ADD_LIBRARY (rols STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h  ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS})
 137 -+ENDIF(SHLIB_STYLE)
 138 -